Making it work for us.
diff --git a/config.xml b/config.xml
index b64fc17..6252ef2 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,6 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="org.apache.mobilespec" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<<<<<<< HEAD
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git a/cordova-plugin-whitelist/test/cordova-incl.js b/cordova-plugin-whitelist/test/cordova-incl.js
index a82c590..ae7c156 100644
--- a/cordova-plugin-whitelist/test/cordova-incl.js
+++ b/cordova-plugin-whitelist/test/cordova-incl.js
@@ -22,6 +22,7 @@
var PLAT;
(function getPlatform() {
var platforms = {
+ amazon_fireos: /cordova-amazon-fireos/,
android: /Android/,
ios: /(iPad)|(iPhone)|(iPod)/,
blackberry10: /(BB10)/,
