Skip to content

Instantly share code, notes, and snippets.

@danzeeeman

danzeeeman/gist:4747438

Created February 9, 2013 22:45
Show Gist options
  • Save danzeeeman/4747438 to your computer and use it in GitHub Desktop.
Save danzeeeman/4747438 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
From https://github.com/openframeworks/openFrameworks
* branch develop -> FETCH_HEAD
warning: Cannot merge binary files: libs/poco/lib/win_cb/libPocoXML.a (HEAD vs. 35c81801047ea28175f6273bf512887214cdb074)
warning: Cannot merge binary files: libs/poco/lib/win_cb/libPocoUtil.a (HEAD vs. 35c81801047ea28175f6273bf512887214cdb074)
warning: Cannot merge binary files: libs/poco/lib/win_cb/libPocoNet.a (HEAD vs. 35c81801047ea28175f6273bf512887214cdb074)
warning: Cannot merge binary files: libs/poco/lib/win_cb/libPocoFoundation.a (HEAD vs. 35c81801047ea28175f6273bf512887214cdb074)
Auto-merging libs/poco/lib/win_cb/libPocoXML.a
CONFLICT (content): Merge conflict in libs/poco/lib/win_cb/libPocoXML.a
Auto-merging libs/poco/lib/win_cb/libPocoUtil.a
CONFLICT (content): Merge conflict in libs/poco/lib/win_cb/libPocoUtil.a
Auto-merging libs/poco/lib/win_cb/libPocoNet.a
CONFLICT (content): Merge conflict in libs/poco/lib/win_cb/libPocoNet.a
Auto-merging libs/poco/lib/win_cb/libPocoFoundation.a
CONFLICT (content): Merge conflict in libs/poco/lib/win_cb/libPocoFoundation.a
Auto-merging libs/openFrameworks/utils/ofURLFileLoader.cpp
Automatic merge failed; fix conflicts and then commit the result.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment