Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=2c8d0e9eddf9fc9c30206a66707227d685341d44
commit 2c8d0e9eddf9fc9c30206a66707227d685341d44 Author: kikadf <[email protected]> Date: Thu Feb 26 13:08:00 2015 +0100 Fix conflict in openmpi diff --git a/source/lib-extra/openmpi/FrugalBuild b/source/lib-extra/openmpi/FrugalBuild index 6748467..c100744 100644 --- a/source/lib-extra/openmpi/FrugalBuild +++ b/source/lib-extra/openmpi/FrugalBuild @@ -5,11 +5,7 @@ options+=('asneeded') pkgname=openmpi pkgver=1.8.4 -<<<<<<< HEAD pkgrel=3 -======= -pkgrel=2 ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 pkgdesc="A high-performance message passing library" url="http://www.open-mpi.org/"; depends=('libstdc++') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
