Fix theme serve failing with the --host property (#1766)

Shopify · Nov 23, 2021 · 8a9b93b · 8a9b93b
1 parent 3fa490f
commit 8a9b93b
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/lib/shopify_cli/theme/dev_server.rb b/lib/shopify_cli/theme/dev_server.rb
@@ -36,11 +36,6 @@ def start(ctx, root, host: "127.0.0.1", port: 9292, poll: false)
           @app = LocalAssets.new(ctx, @app, theme: theme)
           @app = HotReload.new(ctx, @app, theme: theme, watcher: watcher, ignore_filter: ignore_filter)
           stopped = false
-<<<<<<< HEAD
-          address = "http://#{host}:#{port}"
-=======
-          address = "http://#{http_bind}:#{port}"
->>>>>>> 14978da6 (Fix `theme serve` failing when the port is already being used (#1722))
 
           theme.ensure_exists!