lib/moip2.rb in moip2-0.1.3 vs lib/moip2.rb in moip2-0.1.4

@@ -12,14 +12,11 @@
 require "moip2/resource/multi_order"
 require "moip2/resource/multi_payment"
 require "moip2/resource/customer"
 require "moip2/resource/invoice"
 require "moip2/resource/keys"
-<<<<<<< HEAD
 require "moip2/resource/refund"
-=======
 require "moip2/resource/webhooks"
->>>>>>> webhooks
 
 require "moip2/response"
 require "moip2/client"
 require "moip2/order_api"
 require "moip2/multi_order_api"