http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7180

--- Comment #8 from mathieu saby <mathieu.s...@univ-rennes2.fr> ---
new conflit, but maybe my VM is not clean...

CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css


M. saby

-- 
You are receiving this mail because:
You are watching all bug changes.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/

Reply via email to