haitao127
diff --git a/‎.github/workflows/build.yml‎
Lines changed: 4 additions & 0 deletions b/‎.github/workflows/build.yml‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎phoebus-product/phoebus.bat‎
100644100755 b/‎phoebus-product/phoebus.bat‎
100644100755
@@ -17,8 +17,12 @@ jobs:
         java-version: '17'
         maven-version: '3.9.6'
     - name: Build
+<<<<<<< HEAD
 <<<<<<< HEAD
       run: mvn --batch-mode install -DskipTests
 =======
       run: mvn -DskipTests --batch-mode install
 >>>>>>> 07a2b3d51 (Update build.yml)
+=======
+      run: mvn -DskipTests --batch-mode install
+>>>>>>> 07a2b3d5192645043593806abf04bc33b549524d