Merge pull request #429 from timbur/patch-1

"lib": "src-noconflict"
This commit is contained in:
Guy Bedford
2015-06-17 16:22:45 +02:00
@@ -2,11 +2,11 @@
"main": "ace", "main": "ace",
"format": "global", "format": "global",
"directories": { "directories": {
"lib": "src" "lib": "src-noconflict"
}, },
"shim": { "shim": {
"ace": { "ace": {
"exports": "ace" "exports": "ace"
} }
} }
} }