From 88a21195860bb99ab3cbc4b992b1d57bc016fcb4 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Tue, 16 Jun 2020 15:17:00 +0800
Subject: Resolve conflicts: Some refactors on media activities.

---
 app/src/main/AndroidManifest.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'app/src/main/AndroidManifest.xml')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 974c81b6..f26d5ef7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -83,10 +83,6 @@
             android:label="@string/multi_reddit_listing_activity_label"
             android:parentActivityName=".Activity.MainActivity"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity
-            android:name=".Activity.ViewGIFActivity"
-            android:parentActivityName=".Activity.MainActivity"
-            android:theme="@style/AppTheme.Draggable" />
         <activity
             android:name=".Activity.AccountSavedThingActivity"
             android:label="@string/account_saved_thing_activity_label"
@@ -290,7 +286,7 @@
             android:parentActivityName=".Activity.MainActivity"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name=".Activity.ViewImageActivity"
+            android:name=".Activity.ViewImageOrGifActivity"
             android:parentActivityName=".Activity.MainActivity"
             android:theme="@style/AppTheme.Draggable" />
         <activity
-- 
cgit v1.2.3