Merge conflict.
Merge conflicted.
Merge conflicts.
Merge conflicts.
Merge conflict.
Merge branch 'master' of https://github.com/pgillet/Glue.git
Merge branch 'master' of https://github.com/pgillet/Glue.git
Venue Catalog Toulouse Equipements (Issue #8).