From 33d17da8c56cca89f95c446eef956d6fef0edcd5 Mon Sep 17 00:00:00 2001
From: Márcio Alexandre Silva Delgado <coadde@adinet.com.uy>
Date: Wed, 1 Aug 2012 21:39:48 -0300
Subject: luxrays-libre: updating package

---
 libre/luxrays-libre/PKGBUILD | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'libre')

diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD
index 54cc019c9..279e6622e 100644
--- a/libre/luxrays-libre/PKGBUILD
+++ b/libre/luxrays-libre/PKGBUILD
@@ -3,15 +3,9 @@
 # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
 _pkgname=luxrays
 pkgname=luxrays-libre
-<<<<<<< HEAD
 pkgver=1.0rc3
 _pkgver=eb749c000ffc
 pkgrel=1
-=======
-pkgver=1.0rc2
-_pkgver=8707be9e6dc9
-pkgrel=2
->>>>>>> 49036a91fc7b4725702d34335419075ec4aff4f3
 epoch=0
 pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)"
 arch=('i686' 'x86_64' 'mips64el')
-- 
cgit v1.2.3