From 735fa32c15a07cc83f7af22ffe20a67cb73daa30 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 14 Apr 2009 21:20:47 +0200 Subject: [PATCH] bufgix bzr revid: fp@tinyerp.com-20090414192047-1vd6btnt01evfipr --- addons/hr_holidays/hr.py | 4 ---- 1 file changed, 4 deletions(-) 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