Fix colors.xml conflict

See here: arnesson#938
propelinc · Apr 10, 2019 · 84d721b · 84d721b
1 parent 1406197
commit 84d721b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/plugin.xml b/plugin.xml
@@ -52,7 +52,7 @@ xmlns:android="http://schemas.android.com/apk/res/android">
 		<source-file src="src/android/FirebasePluginMessagingService.java" target-dir="src/org/apache/cordova/firebase" />
 		<source-file src="src/android/FirebasePluginMessageReceiver.java" target-dir="src/org/apache/cordova/firebase" />
 		<source-file src="src/android/FirebasePluginMessageReceiverManager.java" target-dir="src/org/apache/cordova/firebase" />
-		<source-file src="src/android/colors.xml" target-dir="res/values" />
+		<source-file src="src/android/cv_plugin_fb_colors.xml" target-dir="res/values" />
 
 		<framework src="src/android/build.gradle" custom="true" type="gradleReference" />
 		<framework src="com.google.android.gms:play-services-tagmanager:+" />

diff --git a/src/android/colors.xml → src/android/cv_plugin_fb_colors.xml b/src/android/colors.xml → src/android/cv_plugin_fb_colors.xml