Remove merge conflict markers from settings.gradle (I forgot to save …

…the file when resolving conflicts earlier :C)
team401 · Nov 23, 2024 · 70bf040 · 70bf040
1 parent 30ebeca
commit 70bf040
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/settings.gradle b/settings.gradle
@@ -11,8 +11,5 @@ plugins {
 }
 
 rootProject.name = 'coppercore'
-<<<<<<< HEAD
-include('geometry', 'wpilib_interface', 'math', 'controls', "parameter_tools")
-=======
-include('geometry', 'wpi_interface', 'math', 'controls', "parameter_tools", 'vision')
->>>>>>> 1260d09 (Move vision to its own package)
+
+include('geometry', 'wpilib_interface', 'math', 'controls', "parameter_tools", 'vision')