search

gdg-x / zeppelin

Awesome conference website in 5 minutes.
http://gdg-x.github.io/zeppelin/
MIT License
678 stars 933 forks source link

Update README.md #51

Closed alouanemed closed 9 years ago

alouanemed commented 9 years ago

add MENAT GDG Summit 2014 to the list

zasadnyy commented 9 years ago

Closing pull request. Added MENAT Summit 2014 manually

alouanemed commented 9 years ago

LOL , why you didn't just merge?

zasadnyy commented 9 years ago

Auto merge didn't worked coz you've forked repository long time ago and there were a lot of changes. For me it was easier to copy changes than cloning both branches, merge locally and push back.

On Sun Feb 15 2015 at 11:20:40 AM Mohamed Alouane notifications@github.com wrote:

LOL , why you didn't just merge?

— Reply to this email directly or view it on GitHub https://github.com/gdg-x/zeppelin/pull/51#issuecomment-74411774.

alouanemed commented 9 years ago

aaah you are talking about merge conflict. My bad ;) It's okay :)