Skip to content

R
red-ci-cd
Commit 765d2741 authored by John Red Medrano's avatar John Red Medrano
Browse files
Options

edit yml

parent 57a98392
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
docker-compose.yml
View file @ 765d2741
...@@ -18,10 +18,4 @@ networks: ...@@ -18,10 +18,4 @@ networks:
driver: bridge driver: bridge
ipam: ipam:
config: config:
<<<<<<< HEAD
- subnet: 172.168.70.0/16 - subnet: 172.168.70.0/16
=======
- subnet: 172.168.70.0/16
>>>>>>> e6c001b78c8f9c9e6279ba90d72e5f86f7eea858
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment