Fix merge wart

dwoz · dwoz · commit bb6c95037744 · 2025-08-28T16:04:27.000-07:00
diff --git a/pkg/rpm/salt.spec b/pkg/rpm/salt.spec
@@ -40,11 +40,7 @@
 %define fish_dir %{_datadir}/fish/vendor_functions.d
 
 Name:    salt
-<<<<<<< HEAD
 Version: 3007.6
-=======
-Version: 3006.15
->>>>>>> 3006.x
 Release: 0
 Summary: A parallel remote execution system
 Group:   System Environment/Daemons
