Commit c7191faf7f25ba319c7db48bc708d45e865a4ba4

Authored by George Vlahavas
1 parent 470b512435

Remove runaway merge line

Showing 1 changed file with 0 additions and 1 deletions

api/.env.example View file @ c7191fa
... ... @@ -51,7 +51,6 @@
51 51  
52 52 KIBANA_PORT=5611
53 53 GRAFANA_PORT=3001
54   -<<<<<<< HEAD
55 54  
56 55 REMOTESYSLOG=192.168.50.32
57 56