fixing conflicts

c25007c8 · John Red Medrano · 4504d257 · 4fe7df4b · c25007c8
Commit c25007c8 authored May 27, 2019 by John Red Medrano
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
      - 7010:8000
    networks:
      rms_main_network:
-        ipv4_address: 172.168.70.10
+        ipv4_address: 172.168.0.10

 networks:
  rms_main_network: