fix conflicts

This commit is contained in:
Ellison Leão
2014-07-23 13:39:53 -03:00

View File

@@ -243,6 +243,8 @@ Must see
* [Html5 Game Development](http://www.html5gamedevelopment.com/)
* [HTML5 Game Devs Forum](www.html5gamedevs.com/)
* [iforce2d](http://www.iforce2d.net/) - A Collection of 2D games resources.
* [GameDevs.org](http://gamedevs.org/)
* [Java Gaming](http://www.java-gaming.org/)
### Books