From bfbac3c9b84ee20ce57cb4a11f275cbf1ff430c4 Mon Sep 17 00:00:00 2001
From: gmarik <gmarik@gmail.com>
Date: Thu, 5 May 2011 22:41:41 -0500
Subject: [PATCH] fix invalid merge

---
 autoload/vundle/installer.vim | 4 ++--
 test/vimrc                    | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim
index b13de3d..8174145 100644
--- a/autoload/vundle/installer.vim
+++ b/autoload/vundle/installer.vim
@@ -17,7 +17,7 @@ func! vundle#installer#install(bang, ...) abort
     call s:doautocmd('BundleInstallPre',      'vundle#bundle')
     call s:doautocmd('BundleInstallPre',      'bundle#'.tolower(bundle.name))
 
-    if a:bang || !(s:installed(bundle))
+    if a:bang || !(bundle.installed())
       call s:doautocmd('BundleInstall',       'vundle#bundle')
       call s:doautocmd('BundleInstall',       'bundle#'.tolower(bundle.name))
       call s:doautocmd('BundleInstallPost',   'vundle#bundle')
@@ -89,7 +89,7 @@ func! s:helptags(rtp) abort
 endf
 
 
-func! s:sync(bang, bundle) abort
+func! vundle#installer#sync(bang, bundle) abort
   if a:bundle.nosync() | return a:bang | endif
   if a:bundle.installed()
     if !(a:bang) | return 0 | endif
diff --git a/test/vimrc b/test/vimrc
index b2ec0c5..c4e272b 100644
--- a/test/vimrc
+++ b/test/vimrc
@@ -38,7 +38,6 @@ Bundle 'rstacruz/sparkup.git', {'rtp': 'vim/'}
 " Camel case
 Bundle 'vim-scripts/RubySinatra'
 
-
 " PostInstall 
 Bundle 'wincent/Command-T'