Permalink
Browse files

resolved conflict

  • Loading branch information...
zalun committed Nov 23, 2011
2 parents c9e6013 + e1d6d1d commit 1318b3c7df96d517ed613c812f72b69d4ed2f35c
Showing with 2 additions and 1 deletion.
  1. +1 −0 data/addon-config.json
  2. +1 −1 package.json
View
@@ -2,6 +2,7 @@
"trustedOrigins": [
"http://flightdeck.zalewa.info/",
"https://builder-addons.allizom.org",
+ "https://builder-addons-dev.allizom.org",
"https://builder-addons-next.allizom.org",
"https://builder.addons.mozilla.org/"
]
View
@@ -3,7 +3,7 @@
"license": "MPL 1.1/GPL 2.0/LGPL 2.1",
"author": "Atul Varma (http://toolness.com/) <atul@mozilla.com>",
"url": "http://github.com/mozilla/addon-builder-helper",
- "version": "0.0.19",
+ "version": "1.2.1.1",
"dependencies": [
"api-utils",
"development-mode"

0 comments on commit 1318b3c

Please sign in to comment.