rhnvrm / breeze-website

:sparkles: Official Website for Breeze 2016 :sparkles:
http://rhnvrm.github.io/breeze-website
Apache License 2.0
4 stars 6 forks source link

I've integrated the image gallery code with the index.html #42

Open samin-batra opened 8 years ago

mr-karan commented 8 years ago

merge conflicts! @samin-batra
To resolve

samin-batra commented 8 years ago

ok now there are no conflicts.

mr-karan commented 8 years ago

Squash all commits. git rebase -i

samin-batra commented 8 years ago

@FlameFractal I only made changes to the breeze_image_gallery.css file and the index file

samin-batra commented 8 years ago

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 :/

mr-karan commented 8 years ago

do a force push for this, with only relevant commits. git rebase helps to drop the commits also