1 files changed, 9 insertions, 0 deletions

diff --git a/datavzrd/.SRCINFO b/datavzrd/.SRCINFO
index b1c4948..b029f51 100644
--- a/datavzrd/.SRCINFO
+++ b/datavzrd/.SRCINFO
@@ -1,12 +1,21 @@
 pkgbase = datavzrd
         pkgdesc = A tool to create visual HTML reports from collections of CSV/TSV tables
+<<<<<<< HEAD
         pkgver = 2.18.1
+=======
+        pkgver = 2.17.1
+>>>>>>> 5f49eaf6e41b5444fb2dc2e372d0180e1db84a49
         pkgrel = 1
         url = https://github.com/datavzrd/datavzrd
         arch = x86_64
         license = MIT
         makedepends = cargo
+<<<<<<< HEAD
         source = datavzrd-2.18.1.tar.gz::https://github.com/datavzrd/datavzrd/archive/refs/tags/v2.18.1.tar.gz
         sha256sums = 4be1e791c43f35de4ab8a7048309f8dc9d3ef41a3c6daaedb629113bc0343f01
+=======
+        source = datavzrd-2.17.1.tar.gz::https://github.com/datavzrd/datavzrd/archive/refs/tags/v2.17.1.tar.gz
+        sha256sums = 6d805ee5e802bb885fd03686dc8e74c8bacb052d66c4a566faa836d8ebdf9f92
+>>>>>>> 5f49eaf6e41b5444fb2dc2e372d0180e1db84a49
 
 pkgname = datavzrd