d523d161fe
Conflicts: theme/bootstrap/style/generated.css
The generated.css file is created from .less files via the method described in the readme in the /less/ folder. It's unwise to directly the edit the generated.css as your changes may be overwritten.