openlp-core team mailing list archive

[Samuel Sjöbergsson <samster9312@xxxxxxxxx>]

> You have a few conflicts to resolve:
> 
> Conflict adding file .classpath.  Moved existing file to .classpath.moved.
> Conflict adding file .project.  Moved existing file to .project.moved.
> Conflict adding file AndroidManifest.xml.  Moved existing file to
> AndroidManifest.xml.moved.
> Conflict adding file android.apk.  Moved existing file to android.apk.moved.
> Conflict adding file assets.  Moved existing file to assets.moved.
> Conflict adding file bin.  Moved existing file to bin.moved.
> Conflict adding file default.properties.  Moved existing file to
> default.properties.moved.
> Conflict adding file gen.  Moved existing file to gen.moved.
> Conflict adding file proguard.cfg.  Moved existing file to proguard.cfg.moved.
> Conflict adding file res.  Moved existing file to res.moved.
> Conflict adding file src.  Moved existing file to src.moved.

Excuse me if I'm wrong but should'nt the old files just be overwritten?
-- 
https://code.launchpad.net/~samster9312/openlp/android/+merge/54984
Your team OpenLP Core is subscribed to branch lp:openlp/android.