resolve conflict

This commit is contained in:
gsell committed 2017-09-27 14:42:30 +02:00
commit 2f2cf48c44
4 files changed
+17

No files matched your search

+1
View File
@@ -1,3 +1,4 @@
gcc/6.1.0 stable b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
gcc/6.2.0 stable b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
gcc/6.3.0 stable b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
gcc/6.4.0 stable b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3