Undo the endline fix

ONLYOFFICE · Oct 16, 2023 · cda3f0f · cda3f0f
1 parent 743b0c8
commit cda3f0f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/traefik/proxy-to-virtual-path.toml b/traefik/proxy-to-virtual-path.toml
@@ -24,4 +24,8 @@ defaultEntryPoints = ["http"]
     X-Forwarded-Prefix = "/documentserver-virtual-path"
 
     [frontends.docservice.routes.vpath]
+<<<<<<< HEAD
     rule = "PathPrefixStrip:/documentserver-virtual-path/"
+=======
+    rule = "PathPrefixStrip:/documentserver-virtual-path/"
+>>>>>>> parent of 4d5d6bd... Fix endline