Merge pull request #429 from timbur/patch-1

"lib": "src-noconflict"
2015-06-17 16:22:45 +02:00
parent 93a5f4dcfe 8f09105301
commit d13ff44c80
1 changed files with 2 additions and 2 deletions
@@ -2,11 +2,11 @@
  "main": "ace",
  "format": "global",
  "directories": {
-    "lib": "src"
+    "lib": "src-noconflict"
  },
  "shim": {
    "ace": {
      "exports": "ace"
    }
  }
-}
+}