From b39f02603bc01ecc45c62303ace1f0f8c31f08fb Mon Sep 17 00:00:00 2001
From: martoko <martoko@users.noreply.github.com>
Date: Sun, 29 Jan 2023 22:18:05 +0100
Subject: [PATCH] Update to 3.15.4

---
 PKGBUILD | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/PKGBUILD b/PKGBUILD
index b63f5b4..57b85da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,11 @@
 # Contributor: Martoko <mbastholm at gmail dot com>
 
 pkgname=nordvpn-bin
+<<<<<<< HEAD
 pkgver=3.16.0
+=======
+pkgver=3.15.4
+>>>>>>> 6d20973 (Update to 3.15.4)
 pkgrel=1
 pkgdesc="NordVPN CLI tool for Linux"
 arch=('x86_64' 'i686' 'armv7h' 'aarch64')
@@ -16,12 +20,21 @@ conflicts=('openvpn-nordvpn')
 install=nordvpn-bin.install
 source_x86_64=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_${pkgver//_/-}_amd64.deb")
 source_i686=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_${pkgver//_/-}_i386.deb")
+<<<<<<< HEAD
 source_armhf=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_${pkgver//_/-}_armhf.deb")
 source_armel=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_${pkgver//_/-}_arm64.deb")
 sha256sums_x86_64=('ca6dcafff50256e8ed350257c361b4dec1971f86a0bd9eaae00c88f3d1e0ea73')
 sha256sums_i686=('cf3c747a238a2fb340e0a4aa0ca820bd822b83d31fb2f8eac742e208e7bf5b2d')
 sha256sums_armhf=('a9d40844114b93b25b43230464eea59bf8833be2fbee94c9ec060972dbd5cb5c')
 sha256sums_armel=('8bc457eb4843cc3d7b714f5fc75bf6aa45a21871c3f5863739fb6a90a06ce428')
+=======
+source_armv7h=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_${pkgver//_/-}_armhf.deb")
+source_aarch64=("https://repo.nordvpn.com/deb/nordvpn/debian/pool/main/nordvpn_${pkgver//_/-}_arm64.deb")
+sha256sums_x86_64=('f32846948e6da8fddb44c339c1ac92939af2cd074fb240e35de3a83c889da335')
+sha256sums_i686=('90fa46def9adcc285e237aa5a7abc3f87e7d4328de3347c61b9b794b3db6a0e7')
+sha256sums_armv7h=('ba014790dbee6523c9d518ae4da93cf09040dd210cba10606c891c1637d10b80')
+sha256sums_aarch64=('e9088f23c34f18f37cbd7d8e9cfaf8222062c89bbc052a3d41a2f1e4f935af33')
+>>>>>>> 6d20973 (Update to 3.15.4)
 
 package() {
     bsdtar -O -xf *.deb data.tar.gz | bsdtar -C "${pkgdir}" -xJf -