Fix vdebug.vim

Author: joonty

plugin/vdebug.vim

@@ -151,7 +151,6 @@ function! vdebug:get_visual_selection()
   let lines[0] = lines[0][col1 - 1:]
   return join(lines, "\n")
 endfunction
-<<<<<<< HEAD
 
 function vdebug:edit(filename)
     try
@@ -160,5 +159,3 @@ function vdebug:edit(filename)
         execute 'silent edit' fnameescape(a:filename)
     endtry
 endfunction
-=======
->>>>>>> fix-file-paths