Merge branch 'master' of https://git.iiens.net/monnot2018/dm_td2 into master

app/build.gradle

@@ -41,6 +41,13 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android.material:material:1.0.0'
     testImplementation 'junit:junit:4.+'
+<<<<<<< HEAD
+  // androidTestImplementation 'com.android.support.test:runner:1.0.2'
+
+   // androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+=======
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+>>>>>>> f7de788a79d6a422d77d0cab63ac99197c44abfb
 }
\ No newline at end of file

app/src/main/AndroidManifest.xml

@@ -9,6 +9,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.DM_td2">
+        tools:replace="android:appComponentFactory"
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />