From c1c428b81d7f8f9caa3c7c31333ad8d1daece750 Mon Sep 17 00:00:00 2001
From: Joan Sala <contact@joansala.com>
Date: Tue, 23 Mar 2021 13:34:35 +0100
Subject: [PATCH] Increase version number (2.1.0)

---
 package/PKGBUILD       | 2 +-
 package/auale.dsc      | 2 +-
 package/auale.spec     | 2 +-
 package/snapcraft.yaml | 6 +-----
 src/auale/auale.py     | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/package/PKGBUILD b/package/PKGBUILD
index 603594c..f7f0b11 100644
--- a/package/PKGBUILD
+++ b/package/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Andrew Dabrowski <dabrowsa@indiana.edu>
 
 pkgname=auale
-pkgver=2.0.0
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="Aualé — The Game of Mancala"
 arch=('any')
diff --git a/package/auale.dsc b/package/auale.dsc
index 751cea8..58f57c7 100644
--- a/package/auale.dsc
+++ b/package/auale.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: auale
 Binary: auale
 Architecture: all
-Version: 2.0.0-1
+Version: 2.1.0-1
 Maintainer: Joan Sala Soler <contact@joansala.com>
 Homepage: https://auale.joansala.com/
 Standards-Version: 4.5.0
diff --git a/package/auale.spec b/package/auale.spec
index c6eb37c..a9cd1f4 100644
--- a/package/auale.spec
+++ b/package/auale.spec
@@ -1,5 +1,5 @@
 Name:           auale
-Version:        2.0.0
+Version:        2.1.0
 Release:        1
 Summary:        Aualé — The Game of Mancala
 URL:            https://auale.joansala.com/
diff --git a/package/snapcraft.yaml b/package/snapcraft.yaml
index f36c980..54ae173 100644
--- a/package/snapcraft.yaml
+++ b/package/snapcraft.yaml
@@ -62,11 +62,7 @@ slots:
 parts:
   auale:
     plugin: dump
-<<<<<<< HEAD
-    source: auale_2.0.0-1_all.deb
-=======
-    source: https://github.com/joansalasoler/auale/releases/download/2.0.0/auale_2.0.0-1_all.deb
->>>>>>> develop
+    source: https://github.com/joansalasoler/auale/releases/download/2.1.0/auale_2.1.0-1_all.deb
     source-type: deb
     build-packages:
       - ca-certificates
diff --git a/src/auale/auale.py b/src/auale/auale.py
index 91d4942..d01c021 100644
--- a/src/auale/auale.py
+++ b/src/auale/auale.py
@@ -41,7 +41,7 @@ class Auale(Gtk.Application):
 
     __gtype_name__ = 'Auale'
 
-    __VERSION = '2.0.0'
+    __VERSION = '2.1.0'
     __DISPLAY_NAME = 'Aualé'
     __ID = 'com.joansala.auale'
     __FLAGS = Gio.ApplicationFlags.HANDLES_OPEN