Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/development'
Browse files Browse the repository at this point in the history
  • Loading branch information
bdw429s committed Dec 4, 2017
2 parents 3b2edd1 + 2916bfe commit 9d10cf5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ External Dependencies:
<property name="distro.groupID" value="ortussolutions" />
<property name="distro.name" value="commandbox"/>
<!-- Special things happen when the version and stableVersion are the same value as that signifies a "stable" build. -->
<property name="commandbox.version" value="3.9.1"/>
<property name="commandbox.stableVersion" value="3.9.1"/>
<property name="commandbox.version" value="3.9.2"/>
<property name="commandbox.stableVersion" value="3.9.2"/>

<!-- Time Label -->
<tstamp prefix="start"/>
Expand Down
2 changes: 1 addition & 1 deletion src/cfml/system/services/PackageService.cfc
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ component accessors="true" singleton {

// Get reference to appropriate dependency struct
if( arguments.dev ) {
boxJSON[ 'devDependencies' ] = boxJSON.devDependencie ?: {};
boxJSON[ 'devDependencies' ] = boxJSON.devDependencies ?: {};
var dependencies = boxJSON.devDependencies;
} else {
boxJSON[ 'dependencies' ] = boxJSON.dependencies ?: {};
Expand Down

0 comments on commit 9d10cf5

Please sign in to comment.