Merge pull request #7 in RMS/api-main-service from red-develop to dev

* commit '765d2741': edit yml

Merge pull request #7 in RMS/api-main-service from red-develop to dev
* commit '765d2741': edit yml
36102fcd · John Red Medrano · 57a98392 · 765d2741 · 36102fcd
Commit 36102fcd authored May 24, 2019 by John Red Medrano
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

docker-compose.yml docker-compose.yml +0 -6

No files found.
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,10 +18,4 @@ networks:
    driver: bridge
    ipam:
      config:
-<<<<<<< HEAD
        - subnet: 172.168.70.0/16
-=======
-        - subnet: 172.168.70.0/16
->>>>>>> e6c001b78c8f9c9e6279ba90d72e5f86f7eea858