Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

adding the Rakefile changes

  • Loading branch information...
commit 239799578f02c6f448ebaa5c23c2ee0e65368c12 1 parent 3563d7f
@nateklaiber authored
Showing with 0 additions and 27 deletions.
  1. +0 −27 Rakefile
View
27 Rakefile
@@ -15,38 +15,11 @@ task :link_vim_conf_files do
end
end
-<<<<<<< HEAD
-vim_plugin_task "ack.vim", "http://github.com/mileszs/ack.vim.git"
-vim_plugin_task "color-sampler", "http://www.vim.org/scripts/download_script.php?src_id=12179"
-vim_plugin_task "conque", "http://conque.googlecode.com/files/conque_1.1.tar.gz"
-vim_plugin_task "fugitive", "http://github.com/tpope/vim-fugitive.git"
-vim_plugin_task "git", "http://github.com/tpope/vim-git.git"
-vim_plugin_task "haml", "http://github.com/tpope/vim-haml.git"
-vim_plugin_task "indent_object", "http://github.com/michaeljsmith/vim-indent-object.git"
-vim_plugin_task "javascript", "http://github.com/pangloss/vim-javascript.git"
-vim_plugin_task "markdown_preview", "http://github.com/robgleeson/vim-markdown-preview.git"
-vim_plugin_task "nerdtree", "http://github.com/scrooloose/nerdtree.git"
-vim_plugin_task "nerdcommenter", "http://github.com/scrooloose/nerdcommenter.git"
-vim_plugin_task "surround", "http://github.com/tpope/vim-surround.git"
-vim_plugin_task "taglist", "http://vim.sourceforge.net/scripts/download_script.php?src_id=7701"
-vim_plugin_task "vividchalk", "http://github.com/tpope/vim-vividchalk.git"
-vim_plugin_task "supertab", "http://github.com/ervandew/supertab.git"
-vim_plugin_task "cucumber", "http://github.com/tpope/vim-cucumber.git"
-vim_plugin_task "textile", "http://github.com/timcharper/textile.vim.git"
-vim_plugin_task "rails", "http://github.com/tpope/vim-rails.git"
-vim_plugin_task "rspec", "http://github.com/taq/vim-rspec.git"
-vim_plugin_task "zoomwin", "http://www.vim.org/scripts/download_script.php?src_id=9865"
-vim_plugin_task "snipmate", "http://github.com/msanders/snipmate.vim.git"
-vim_plugin_task "autoclose", "http://github.com/Townk/vim-autoclose.git"
-vim_plugin_task "markdown", "http://github.com/tpope/vim-markdown.git"
-vim_plugin_task "align", "http://github.com/tsaleh/vim-align.git"
-=======
namespace :dev do
desc "Update submodules"
task :update_submodules do
sh "git submodule foreach git pull origin master"
end
->>>>>>> upstream/master
# Taken from RefineryCMD
# https://github.com/resolve/refinerycms/blob/master/core/lib/tasks/refinery.rake
Please sign in to comment.
Something went wrong with that request. Please try again.