lib/attractor/version.rb~ in attractor-2.4.0 vs lib/attractor/version.rb~ in attractor-2.5.0
- old
+ new
@@ -1,7 +1,3 @@
module Attractor
-<<<<<<< HEAD
VERSION = "2.4.0"
-=======
- VERSION = "2.3.0"
->>>>>>> 1b4d274a6c7f6634ac4b6c2627f5de500788cef4
end