search

crittercism / crittercism-unity-ios

Unity Plugin for Crittercism iOS Crash Reporting
Other
28 stars 15 forks source link

CrittercismUnity.mm bad commit #5

Closed dhodev closed 10 years ago

dhodev commented 10 years ago

The committed file at "Plugins/PluginSource/CrittercismUnityLibrary/CrittercismUnity.mm" looks like a conflicted merge (on Feb 9 2014). It's full of conflict markup so it needs resolving.

dshirley commented 10 years ago

For the time being I've reverted all of the changes from Feb 9. Thanks for bringing this to our attention.

dhodev commented 10 years ago

That file is still corrupted. If you search for "<<<<<<< HEAD" you'll see what I mean.

dshirley commented 10 years ago

@dhodev The developer that submitted the offending code is on vacation until next Monday. We'll have him fix this when he returns. Thanks.

pixelknitter commented 10 years ago

This has been fixed in the latest update.