[Koha-bugs] [Bug 18462] Implemented bootstrap styling on the web installer and onboarding tool

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=18462

Marc Véron <veron at veron.ch> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |veron at veron.ch

--- Comment #11 from Marc Véron <veron at veron.ch> ---
Sorry again, I get a merge conflict:

Wende an: Bug 17855: Onboarding tool
Verwende Informationen aus der Staging-Area, um einen Basisverzeichnis
nachzustellen
M       installer/install.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
Falle zurück zum Patchen der Basis und des 3-Wege-Merges...
automatischer Merge von
koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
KONFLIKT (Inhalt): Merge-Konflikt in
koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
automatischer Merge von installer/install.pl
KONFLIKT (Inhalt): Merge-Konflikt in installer/install.pl

-- 
You are receiving this mail because:
You are the assignee for the bug.
You are watching all bug changes.