This commit is contained in:
les 2020-11-04 09:30:06 +01:00
parent 7b19319866
commit ee194e16a5

View file

@ -29,8 +29,4 @@ services:
depends_on:
- db
ports:
<<<<<<< HEAD
- "127.0.0.1:13120:13120"
=======
- 127.0.0.1:13120:13120
>>>>>>> master