Fix file conflicts

2 files changed, 3 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f021b25285dc..67dc1f6a0918 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = madagascar-git
 	pkgdesc = Multidimensional data analysis and reproducible computational experiments.
-	pkgver = r15660.e9eaa7b64
+	pkgver = r15675.c0a0b1a5d
 	pkgrel = 1
 	url = https://www.reproducibility.org/wiki/Main_Page
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 68e04f236973..d8a36cb9e179 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: anon at sansorgan.es
 # Contributor: Yingchang Liu
 pkgname=madagascar-git
-pkgver=r15660.e9eaa7b64
+pkgver=r15675.c0a0b1a5d
 pkgrel=1
 pkgdesc="Multidimensional data analysis and reproducible computational experiments."
 url="https://www.reproducibility.org/wiki/Main_Page"
@@ -32,6 +32,7 @@ build() {
   
   ./configure API=c++,f90 --prefix=${RSFROOT}
   make
+  mv ./user/.hwang ./user/hwang
 }
 
 package() {