git-svn-id: https://msi/svn/firstRepo/Management/trunk@57 0f545695-f87b-41b6-9a03-7f16563b5454

2016-01-29 16:51:39 +00:00
parent e5ee39281d
commit d45146fc23
3 changed files with 66 additions and 49 deletions
@@ -2,7 +2,9 @@ var myManifest = {
    Debug: (window.location.port !== ""),
    Name: "Il Management",
    Version: "0.3.0.0",
-    Author: "Denis Ironi",
+<<<<<<< .mine    Version: "0.2.1.0",
+=======    Version: "0.3.0.0",
+>>>>>>> .theirs    Author: "Denis Ironi",
    Settings: {
        DefaultURL: (window.location.port === "" ? "http://" + window.location.host + "/Service": "http://" + window.location.hostname + ":" + window.location.port + "/Service_Manut"),
        JQueryVersion: "1.11.1",