iOS compiling error in XCode 5

[loaer]

Using index info to reconstruct a base tree...
M contrib/src/ffmpeg/rules.mak
Falling back to patching base and 3-way merge...
Auto-merging contrib/src/ffmpeg/rules.mak
CONFLICT (content): Merge conflict in contrib/src/ffmpeg/rules.mak
Failed to merge in the changes.
Patch failed at 0023 contrib/libavcodec: update hash and tweak configure chain a bit
The copy of the patch that failed is found in:
/Users/test/Documents/vlc/ios/ImportedSources/VLCKit/MobileVLCKit/ImportedSources/vlc/.git/rebase-apply/patch


How do I resolve it?

The environment is:
1. XCode 5
2. sdk: iPhoneSimulator 7.0
3. MountainLion, 10.8.5

Thanks.

[fkuehne]

Hello

This will be resolved later today. Please re-try in the european evening hours.