fix incorrect merge conflict handling

gluonhq · Feb 29, 2024 · 6fb6269 · 6fb6269
1 parent a406157
commit 6fb6269
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/java/client/build.gradle b/java/client/build.gradle
@@ -26,17 +26,17 @@ sourceSets {
             srcDir '../../proto'
         }
     }
+    test {
+        java {
+            srcDir '../shared/test/java'
+        }
+    }
 }
 
 protobuf {
     protoc {
         artifact = 'com.google.protobuf:protoc:3.24.4'
     }
-    test {
-        java {
-            srcDir '../shared/test/java'
-        }
-    }
 }
 
 dependencies {

diff --git a/java/server/build.gradle b/java/server/build.gradle
@@ -26,17 +26,17 @@ sourceSets {
             srcDir '../../proto'
         }
     }
+    test {
+        java {
+            srcDir '../shared/test/java'
+        }
+    }
 }
 
 protobuf {
     protoc {
         artifact = 'com.google.protobuf:protoc:3.24.4'
     }
-    test {
-        java {
-            srcDir '../shared/test/java'
-        }
-    }
 }
 
 dependencies {