conflict fixed

9b27b1b7 · John Red Medrano · 3acde449 · e6c001b7 · 9b27b1b7 · 9b27b1b7
Commit 9b27b1b7 authored May 24, 2019 by John Red Medrano
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

Dockerfile Dockerfile +1 -1

docker-compose.yml docker-compose.yml +7 -1

No files found.
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,4 +5,4 @@ ADD . /code
 COPY . /code
 WORKDIR /code
 RUN pip install -r requirements/local.txt
-EXPOSE 9080
+EXPOSE 7010
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,4 +18,10 @@ networks:
    driver: bridge
    ipam:
      config:
-        - subnet: 172.168.70.0/16
\ No newline at end of file
+<<<<<<< HEAD
+        - subnet: 172.168.70.0/16
+=======
+        - subnet: 172.168.70.0/16
+
+
+>>>>>>> e6c001b78c8f9c9e6279ba90d72e5f86f7eea858