Indizen 2019 talks - Githubissues

madridccppug / meetups

Slides, presentations, videos,... all the material from meetups

https://madridccppug.github.io/meetups/

2 stars 7 forks source link

Closed newlawrence closed 4 years ago

newlawrence commented 4 years ago

I've created the folders for the missing talks we've had at Indizen this year with their respective welcome presentations.

I've also added Francisco's April presentation. There are our last Godot talk and both @jgsogo lightning talks left.

Manu343726 commented 4 years ago

There's a conflict with @jgsogo's #35 I think

newlawrence commented 4 years ago

You're right. Not sure what is best, for me to close this PR and rebase my changes to #35. Or wait for @jgsogo to merge his and then this.

jgsogo commented 4 years ago

Ok, mine is merged, I've created a PR to your branch with the changes https://github.com/newlawrence/Meetups/pull/1 Merge it and we are ready 💪

newlawrence commented 4 years ago

Ok, I messed up with the history a little bit, but it's fixed now, we are able to merge this branch.

jgsogo commented 4 years ago

Thanks a lot! Happy New Year!