bold-commerce / go-shopify

Go client for the Shopify API
MIT License
326 stars 255 forks source link

feature/order-add-payment-terms-to-order #297

Closed DamienDelprat closed 4 months ago

DamienDelprat commented 4 months ago

Doc :

image
DamienDelprat commented 4 months ago

Where does the merge conflict come from ?

oliver006 commented 4 months ago

Where does the merge conflict come from ?

No idea, try rebasing?