remove diff stuff

illia-danko · May 10, 2021 · 7b55bdc · 7b55bdc
1 parent fcb02c9
commit 7b55bdc
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/plugin/lf.vim b/plugin/lf.vim
@@ -1,9 +1,5 @@
 " Copyright (c) 2015 François Cabrol
-<<<<<<< HEAD:plugin/lf.vim
-" Copyright (c) 2021 Illia Danko
-=======
 " Copyright (c) 2021 Illia Danko ([email protected])
->>>>>>> 22aac52f6e434eeeef14d3bf7bce034b4ed32464:plugin/ranger.vim
 "
 " MIT License
 "