merge conflicts

googleapis · Oct 26, 2023 · fb7371b · fb7371b
1 parent a2f3440
commit fb7371b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/samples/snippets/src/main/java/pubsub/CreateCloudStorageSubscriptionExample.java b/samples/snippets/src/main/java/pubsub/CreateCloudStorageSubscriptionExample.java
@@ -18,12 +18,12 @@
 
 // [START pubsub_create_cloud_storage_subscription]
 import com.google.cloud.pubsub.v1.SubscriptionAdminClient;
+import com.google.protobuf.Duration;
 import com.google.pubsub.v1.CloudStorageConfig;
 import com.google.pubsub.v1.ProjectSubscriptionName;
 import com.google.pubsub.v1.ProjectTopicName;
 import com.google.pubsub.v1.Subscription;
 import java.io.IOException;
-import com.google.protobuf.Duration;
 
 public class CreateCloudStorageSubscriptionExample {
   public static void main(String... args) throws Exception {