Advertisement
Guest User

Untitled

a guest
Mar 5th, 2015
191
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.34 KB | None | 0 0
  1. CONFLICT (modify/delete): src/extensions/default/thimbleProxy deleted in Remove HideUI and thimbleProxy submodules, update .gitmodules, update ExtensionLoader.js, update brackets-browser-livedev to the latest commit and modified in HEAD. Version HEAD of src/extensions/default/thimbleProxy left in tree at src/extensions/default/thimbleProxy~HEAD.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement