Permalink
Browse files

cleaned code in deploy.rb

  • Loading branch information...
bossiernesto committed Feb 7, 2013
1 parent f46c54e commit b18e7a25c4d10dfcf9206f150503daa10d939343
Showing with 0 additions and 8 deletions.
  1. +0 −8 config/deploy.rb
View
@@ -1,13 +1,5 @@
-<<<<<<< HEAD
-set :application, "ghostandthemachines.com/sinatra-haml-bootstrap-basic-hero"
-set :user, "jon"
-set :repository, "git@ghostandthemachines.com:sinatra-haml-bootstrap-hero.git"
-set :domain, "ghostandthemachines.com"
-set :deploy_to, "~/sites/#{application}"
-=======
set :application, "yoursite.com/sinatra-haml-bootstrap-basic-hero"
set :user, "user"
set :repository, "git@yourrepo.com:sinatra-haml-bootstrap-hero.git"
set :domain, "yoursite.com"
set :deploy_to, "~/sites/#{application}"
->>>>>>> 3f58f8fc8a391cdcfbeb6218cb465345bc19fca6

0 comments on commit b18e7a2

Please sign in to comment.