remove main

Author: Metaphysiker

deploy-on-digital-ocean-from-master-branch.sh

@@ -3,11 +3,8 @@ rails assets:clobber
 RAILS_ENV=production rails assets:precompile
 git add .
 git commit -m "precompile"
-<<<<<<< HEAD
-git push origin main
-=======
 git push origin master
->>>>>>> dev
+
 
 ssh [email protected] << EOF
   cd dialectica