Permalink
Browse files

- Fixed conflict marker.

  • Loading branch information...
1 parent 010d983 commit adb0bf77b30bd5fa9f51c0e85d6d7c7b3cb66b1d @Shougo Shougo committed Jul 12, 2011
Showing with 0 additions and 4 deletions.
  1. +0 −4 autoload/vimshell/interactive.vim
@@ -1,11 +1,7 @@
"=============================================================================
" FILE: interactive.vim
" AUTHOR: Shougo Matsushita <Shougo.Matsu@gmail.com>
-<<<<<<< HEAD
" Last Modified: 12 Jul 2011.
-=======
-" Last Modified: 11 Jul 2011.
->>>>>>> 1dc9bfd77f95a72515b6e9110a52e6b8f66e50da
" License: MIT license {{{
" Permission is hereby granted, free of charge, to any person obtaining
" a copy of this software and associated documentation files (the

0 comments on commit adb0bf7

Please sign in to comment.