Fix merge conflicts in #33 Gestures Added PR

brangerbriz / liBB.js

A JavaScript library/framework for creating interactive && generative apps + installations in/out of the browser

http://libb.brangerbriz.com/

GNU General Public License v3.0

1 stars 2 forks source link

Fix merge conflicts in #33 Gestures Added PR #34

Closed brannondorsey closed 8 years ago

brannondorsey commented 8 years ago

Fix merge conflict from https://github.com/brangerbriz/liBB.js/pull/33.

brannondorsey commented 8 years ago

Hey @cfvalencia9277, https://github.com/brangerbriz/liBB.js/pull/33 had some merge conflicts so I pulled from your branch, fixed the conflicts and am now going to merge into develop. Thanks for these updates!