fix merge conflict

gigsmart · Jan 18, 2024 · 8739fdb · 8739fdb
1 parent 15dbbcd
commit 8739fdb
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/spaceship/lib/spaceship/connect_api/tunes/tunes.rb b/spaceship/lib/spaceship/connect_api/tunes/tunes.rb
@@ -160,12 +160,6 @@ def patch_app(app_id: nil, attributes: {}, app_price_tier_id: nil, territory_ids
             included << {
               type: "appPrices",
               id: "${price1}",
-<<<<<<< HEAD
-=======
-              attributes: {
-                # startDate: nil
-              },
->>>>>>> f8776fc2719e194dbc89b0d77c49fcc22ea7e561
               relationships: {
                 app: {
                   data: {