[cairo-commit] [cairo-www] src/todo.mdwn

[Chris Wilson]

 src/todo.mdwn |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit aad99b98da19932836e4d3de3129c1d2b4d5e0f0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Oct 26 15:42:13 2008 +0000

    [todo] Remove merge conflict

diff --git a/src/todo.mdwn b/src/todo.mdwn
index 7e8b671..9e384f7 100644
--- a/src/todo.mdwn
+++ b/src/todo.mdwn
@@ -282,7 +282,6 @@ Other fixes
  * Use a solid-pattern in place of 1x1 surfaces:
    [source](https://bugs.freedesktop.org/show_bug.cgi?id=5904#c4)
 
-<<<<<<< HEAD:src/todo.mdwn
  * Transparency should be optionally flattened to a new path rather than a bitmap.
 
    Currently PS/EPS surface flattens transparency to a bitmap. This can make a