search

GT-RAIL / nav2djs

2D Navigation Widget
http://robotwebtools.org/
Other
51 stars 37 forks source link

Removing jquery from dependency. #5

Closed jihoonl closed 12 years ago

jihoonl commented 12 years ago

.

baalexander commented 12 years ago

This Pull Request cannot be automatically merged, which usually implies a merge conflict. Looking at the history in your fork, it looks like you haven't grabbed the latest changes from nav2d.

You can grab the latest changes by:

# Add a link to the RobotWebTools repo
git remote add rwt https://github.com/RobotWebTools/nav2djs.git
# Pull in changes from RobotWebTools repo (will probably cause a conflict)
git remote pull rwt master
# Push the changes to your fork (I'm assuming it's called origin, you can list remotes by doing `git remote`)
git push origin master

If you need help, lemme know!