Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- 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