MadelynTav · alizinha · Jul 22, 2015 · Jul 23, 2015 · Jul 23, 2015
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+MemeProject/MemeProject.iml
+MemeProject/app/app.iml
diff --git a/MemeProject/.idea/misc.xml b/MemeProject/.idea/misc.xml
diff --git a/MemeProject/MemeProject.iml b/MemeProject/MemeProject.iml
diff --git a/MemeProject/app/app.iml b/MemeProject/app/app.iml
diff --git a/MemeProject/app/libs/slf4j-android-1.7.12.jar b/MemeProject/app/libs/slf4j-android-1.7.12.jar
diff --git a/MemeProject/app/libs/slf4j-api-1.7.12.jar b/MemeProject/app/libs/slf4j-api-1.7.12.jar
diff --git a/MemeProject/app/src/main/AndroidManifest.xml b/MemeProject/app/src/main/AndroidManifest.xml
@@ -30,7 +30,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".MemeList"
+        <activity android:name=".MemeListActivity"
             android:label="MemeList"
             android:screenOrientation="portrait">
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		MemeProject/MemeProject.iml
		MemeProject/app/app.iml