[fix] (#291)

NUTFes · Mar 4, 2023 · 2ac78be · 2ac78be
1 parent cb55052
commit 2ac78be
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -100,14 +100,10 @@ services:
       - '6006:6006'
     volumes:
       - ./view:/app/next-project
-<<<<<<< HEAD
-    command: 'npm run dev'
     environment:
       SSR_API_URI: 'http://go:1323/api'
       CSR_API_URI: 'http://localhost:1323'
-=======
     command: sh -c 'npm run dev & npm run storybook'
->>>>>>> develop
     depends_on:
       - go
     tty: true