aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir/test_lambda.vim
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim/testdir/test_lambda.vim')
-rw-r--r--src/nvim/testdir/test_lambda.vim4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/nvim/testdir/test_lambda.vim b/src/nvim/testdir/test_lambda.vim
index 98d8ffab40..d51b6f7c5a 100644
--- a/src/nvim/testdir/test_lambda.vim
+++ b/src/nvim/testdir/test_lambda.vim
@@ -284,7 +284,3 @@ func Test_named_function_closure()
call garbagecollect()
call assert_equal(14, s:Abar())
endfunc
-=======
->>>>>>> 42b34811... vim-patch:7.4.2119
-=======
->>>>>>> 789a3319... vim-patch:7.4.2120