gistfile1.txt

TheMuppets proprietary_vendor_samsung
From github.com:TheMuppets/proprietary_vendor_samsung
 * branch            cm-10.1    -> FETCH_HEAD
warning: Cannot merge binary files: jf-common/proprietary/lib/hw/camera.msm8960.so (HEAD vs. FETCH_HEAD)

Auto-merging jf-common/proprietary/vendor/lib/libqmiservices.so
CONFLICT (add/add): Merge conflict in jf-common/proprietary/vendor/lib/libqmiservices.so
Auto-merging jf-common/proprietary/vendor/lib/libqmi_csi.so
CONFLICT (add/add): Merge conflict in jf-common/proprietary/vendor/lib/libqmi_csi.so
Auto-merging jf-common/proprietary/vendor/lib/libqmi_client_qmux.so
CONFLICT (add/add): Merge conflict in jf-common/proprietary/vendor/lib/libqmi_client_qmux.so
Auto-merging jf-common/proprietary/vendor/lib/libqmi_cci.so
CONFLICT (add/add): Merge conflict in jf-common/proprietary/vendor/lib/libqmi_cci.so
Auto-merging jf-common/proprietary/vendor/lib/libqmi.so
CONFLICT (add/add): Merge conflict in jf-common/proprietary/vendor/lib/libqmi.so
Auto-merging jf-common/proprietary/vendor/lib/libqcci_legacy.so
CONFLICT (add/add): Merge conflict in jf-common/proprietary/vendor/lib/libqcci_legacy.so
Auto-merging jf-common/proprietary/vendor/lib/libidl.so
CONFLICT (add/add): Merge conflict in jf-common/proprietary/vendor/lib/libidl.so
Auto-merging jf-common/proprietary/lib/hw/camera.msm8960.so
CONFLICT (content): Merge conflict in jf-common/proprietary/lib/hw/camera.msm8960.so
CONFLICT (rename/delete): celoxdcm/proprietary/lib/egl/libplayback_adreno200.so deleted in FETCH_HEAD and renamed in HEAD. Version HEAD of celoxdcm/proprietary/lib/egl/libplayback_adreno200.so left in tree.
CONFLICT (rename/delete): celoxdcm/proprietary/etc/firmware/yamato_pm4.fw deleted in FETCH_HEAD and renamed in HEAD. Version HEAD of celoxdcm/proprietary/etc/firmware/yamato_pm4.fw left in tree.
CONFLICT (rename/delete): celoxdcm/proprietary/etc/firmware/yamato_pfp.fw deleted in FETCH_HEAD and renamed in HEAD. Version HEAD of celoxdcm/proprietary/etc/firmware/yamato_pfp.fw left in tree.
Automatic merge failed; fix conflicts and then commit the result.