From: | armin76@g.o |
---|---|
To: | releng@g.o, gentoo-releng-autobuilds@l.g.o |
Subject: | [gentoo-releng-autobuilds] [alpha-auto] Catalyst build error - pre_build |
Date: | Sat, 05 Jan 2013 02:15:07 |
Message-Id: | E1TrJHs-0004kL-0L@monolith.freenet-rz.de |
1 | Your pre_build function sucks |
2 | |
3 | |
4 | From git://git.overlays.gentoo.org/proj/releng |
5 | + 29f3c9c...d3d7152 master -> origin/master (forced update) |
6 | Auto-merging tools-uclibc/run.sh |
7 | CONFLICT (content): Merge conflict in tools-uclibc/run.sh |
8 | Automatic merge failed; fix conflicts and then commit the result. |
9 | |
10 | |
11 | |
12 | Full build log at /catalyst-auto.18115/log/pre_build.log |