Closed cretaceous-creature closed 8 years ago
Uh...just figure out what kind of conflict.
or u can create another branch and i will send a pr to that one .... lunch time...u wanna go with us? wesley and me
@cretaceous-creature create new branch "ros-indigo" from "master". However, both of the branch is modified by my larget commit 8f91c49588fe5ef990485730731cd0db646298c8, which means, you have to merge the difference manually in your local repository. Or you can update your local repository from this upstream, and directly modified the master branch...
plz check if it is ok