summaryrefslogtreecommitdiff
path: root/libre/luxrays-libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre/luxrays-libre')
-rw-r--r--libre/luxrays-libre/PKGBUILD6
1 files changed, 0 insertions, 6 deletions
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')