Rakefile in moip2-0.1.3 vs Rakefile in moip2-0.1.4

@@ -6,10 +6,6 @@
   RSpec::Core::RakeTask.new(:spec)
 
   task :default => :spec
 rescue LoadError
   # no rspec available
-<<<<<<< HEAD
 end
-=======
-end
->>>>>>> webhooks