Rakefile in moip2-0.1.1 vs Rakefile in moip2-0.1.3

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