fix rebase mistake

JeffersonLab · Jan 22, 2025 · 0647029 · 0647029
1 parent 9d64e62
commit 0647029
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/common-tools/clas-geometry/pom.xml b/common-tools/clas-geometry/pom.xml
@@ -17,11 +17,7 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
-<<<<<<< HEAD
-      <version>23</version>
-=======
       <version>24-ea+5</version>
->>>>>>> d4e3960bd (build(deps): bump org.openjfx:javafx-controls from 22.0.2 to 24-ea+5)
     </dependency>
     <dependency>
       <groupId>org.jlab.ccdbrcdb</groupId>