Open samin-batra opened 8 years ago
ok now there are no conflicts.
Squash all commits. git rebase -i
@FlameFractal I only made changes to the breeze_image_gallery.css file and the index file
https://samin-batra.github.io/breeze-website/index.html the menu bar, the contact and the map sections are getting messed up in my file :/
do a force push for this, with only relevant commits. git rebase helps to drop the commits also
merge conflicts! @samin-batra
To resolve