bufgix

bzr revid: fp@tinyerp.com-20090414192047-1vd6btnt01evfipr
2009-04-14 21:20:47 +02:00
parent 8531406268
commit 735fa32c15
1 changed files with 0 additions and 4 deletions
@@ -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