Merge remote-tracking branch 'refs/remotes/origin/feature/02-BE-RDS'

Conflicts: backend/backend/settings.py docker-compose.yml
reBike · Jul 13, 2022 · 5529e4b · 5529e4b
2 parents c22893f + f7db892
commit 5529e4b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/backend/requirements.txt b/backend/requirements.txt
@@ -0,0 +1,2 @@
+django==4.0.6
+pillow
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,11 +8,18 @@ services:
       - 8080:8080
     volumes:
       - ./backend:/app
+<<<<<<< HEAD
 
+=======
+>>>>>>> 02-BE-RDS
 #  frontend:
 #    build: ./frontend
 #    command: ["npm", "start"]
 #    ports:
 #      - 3000:3000
 #    volumes:
+<<<<<<< HEAD
 #      - ./frontend:/app
+=======
+#      - ./frontend:/app
+>>>>>>> 02-BE-RDS