tidying conflict

tomharvey · May 2, 2022 · 2a6152f · 2a6152f
1 parent b366f24
commit 2a6152f
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -75,7 +75,6 @@ to understand the full list of attributes to send.
 
 ``` ruby
 order = Pwinty::Order.new(
-<<<<<<< HEAD
   shippingMethod: "Budget",
   recipient: {
     name: "Tom Harvey",