From f5a63accc1d7b00f7cb2ae177d12d0e2847381b3 Mon Sep 17 00:00:00 2001
From: JLo'w <Jean-Loup.Beaussart@polytech-lille.net>
Date: Fri, 6 May 2016 02:16:36 +0200
Subject: [PATCH] MAJ du manifest

---
 PremiereActivite/app/src/main/AndroidManifest.xml |  9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/PremiereActivite/app/src/main/AndroidManifest.xml b/PremiereActivite/app/src/main/AndroidManifest.xml
index cae68f2..d3a9172 100644
--- a/PremiereActivite/app/src/main/AndroidManifest.xml
+++ b/PremiereActivite/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <!-- Nécessaire pour utiliser les cartes NFC -->
     <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.INTERNET" />
+
     <uses-feature android:name="android.hardware.nfc" android:required="true" />
 
     <application
@@ -13,16 +14,10 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity
-            android:name=".CarteActivite"
-            android:launchMode="singleTask"
-            android:label="CarteActivite"
-            android:parentActivityName="com.example.app_10p5.MainActivite" >
-        </activity>
 
         <activity
             android:name=".MainActivite"
-            android:label="MainActivite">
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
--
libgit2 0.21.2