Skip to content

Commit

Permalink
Fixed previous commit
Browse files Browse the repository at this point in the history
  • Loading branch information
balupton committed Feb 20, 2011
1 parent a6e61bf commit 1294fae
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cli
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ class App
end

# Deploy the Changes From Master to Version + Dev
def deploy-from-master
def deploy_from_master
has_changes
version
merge(BRANCH_MASTER)
Expand All @@ -360,7 +360,7 @@ class App
end

# Deploy the Changes From Dev to Version + Master
def deploy-from-dev
def deploy_from_dev
has_changes
version
merge(BRANCH_DEV)
Expand Down

0 comments on commit 1294fae

Please sign in to comment.