fixed trivial conflicts

[xynt.git] / web / xynt / xynt-commons.js

diff --git a/web/xynt/xynt-commons.js b/web/xynt/xynt-commons.js
index 9af0555..550cc28 100644 (file)
--- a/web/xynt/xynt-commons.js
+++ b/web/xynt/xynt-commons.js
@@ -210,4 +210,4 @@ function url_complete(parent, url)
     else {
         return (host+path+url);
     }
-}
\ No newline at end of file
+}