Solving modified date and length conflicts

[pub/Android/ownCloud.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 91b215d..597e600 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -131,6 +131,8 @@
         <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
         <activity android:name=".extensions.ExtensionsListActivity"></activity>\r
         <activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>\r
+        <activity android:name=".ui.activity.ConflictsResolveActivity"/>
+            
         <service android:name=".files.services.FileUploader" >\r
         </service>
         <service android:name=".files.services.InstantUploadService" />