diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr.py
index 814a21949d1..2119cb262f7 100644
--- a/addons/hr_holidays/hr.py
+++ b/addons/hr_holidays/hr.py
@@ -345,7 +345,3 @@ class holiday_user_log(osv.osv):
     }
 holiday_user_log()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-=======
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:>>>>>>> MERGE-SOURCE