From 22097287cc110cf1be09b9d4559317cdb225634c Mon Sep 17 00:00:00 2001
From: root <root@rn628x.THREEFIFTEEN.INFO>
Date: Wed, 21 Aug 2019 19:58:19 -0700
Subject: [PATCH] Update ReadyNAS configs.

---
 debian/changelog           | 46 +++++---------------------------------
 debian/readynas/config.xml |  4 ++--
 2 files changed, 8 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 67b7ac9..1a3c837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,44 +1,10 @@
-<<<<<<< HEAD
+zerotier-one (1.4.2-nt1) unstable; urgency=medium
+
+  * Imported Upstream version 1.4.2
+
+ -- didyouexpectthat <github@didyouexpect.us> Wed, 21 Aug 2019 20:00:00 -0800
+
 zerotier-one (1.2.4-nt1) unstable; urgency=medium
-=======
-zerotier-one (1.4.2) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Thu, 04 Aug 2019 01:00:00 -0700
-
-zerotier-one (1.4.0) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Thu, 29 Jul 2019 01:00:00 -0700
-
-zerotier-one (1.2.12) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 25 Jul 2018 01:00:00 -0700
-
-zerotier-one (1.2.10) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 08 May 2018 01:00:00 -0700
-
-zerotier-one (1.2.8) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 27 Apr 2018 01:00:00 -0700
-
-zerotier-one (1.2.6) unstable; urgency=medium
-
-  * See https://github.com/zerotier/ZeroTierOne for release notes.
-
- -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Tue, 17 Apr 2018 01:00:00 -0700
-
-zerotier-one (1.2.4) unstable; urgency=medium
->>>>>>> upstream/1.4.2
 
   * Imported Upstream version 1.2.4
 
diff --git a/debian/readynas/config.xml b/debian/readynas/config.xml
index 84897f9..519638f 100644
--- a/debian/readynas/config.xml
+++ b/debian/readynas/config.xml
@@ -1,6 +1,6 @@
 <Application resource-id="nastools-zerotier-one">
-  <Version>1.2.4-nt1</Version>
-  <MinFirmwareVer>6.9.2</MinFirmwareVer>
+  <Version>1.4.2-nt1</Version>
+  <MinFirmwareVer>6.10.0</MinFirmwareVer>
   <Name>ZeroTier One NT</Name>
   <Author>NAStools</Author>
   <RequireReboot>0</RequireReboot>