[cairo-commit] [cairo-www] src/summit

Carl Worth cworth at freedesktop.org
Tue Aug 26 14:58:36 PDT 2008


 src/summit/2008/notes.mdwn |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 1619325d9dccec952a2df5724b61f96180150018
Author: Carl Worth <cworth at cworth.org>
Date:   Tue Aug 26 14:58:13 2008 -0700

    More fix x of botched merge

diff --git a/src/summit/2008/notes.mdwn b/src/summit/2008/notes.mdwn
index 88e8f16..7a42cb6 100644
--- a/src/summit/2008/notes.mdwn
+++ b/src/summit/2008/notes.mdwn
@@ -218,7 +218,6 @@ good or not?
 
 Vlad: Should be possible, definitely.
 
-<<<<<<< HEAD:src/summit/2008/notes.mdwn
 Behdad: Let's choose Fedora rawhide as our initial reference platform
 to make the whole test suite work and then extend from there, (Fedora,
 Ubuntu, Win32, OS X, etc.).


More information about the cairo-commit mailing list