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

2016-02-14 21:46:23 +00:00
parent d45146fc23
commit 94bcb4e1e2
3 changed files with 8 additions and 5 deletions
@@ -1,10 +1,8 @@
 var myManifest = {
    Debug: (window.location.port !== ""),
    Name: "Il Management",
-    Version: "0.3.0.0",
-<<<<<<< .mine    Version: "0.2.1.0",
-=======    Version: "0.3.0.0",
->>>>>>> .theirs    Author: "Denis Ironi",
+    Version: "0.3.0.1",
+    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",