1 files changed, 3 insertions, 0 deletions

diff --git a/PKGBUILD b/PKGBUILD
index bb168b6ad026..b892a6c6000a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,11 @@
+<<<<<<< HEAD
 # This is an example PKGBUILD file. Use this as a start to creating your own,
 # and remove these comments. For more information, see 'man PKGBUILD'.
 # NOTE: Please fill out the license field for your package! If it is unknown,
 # then please put 'unknown'.
 
+=======
+>>>>>>> origin/master
 # Maintainer: Zurg Egg (k1hn3trj7@mozmail.com)
 pkgname=convolv2
 pkgver=0.7.2