[Xcb-commit] Publications.mdwn

[Jamey Sharp]

 Publications.mdwn |    7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

New commits:
commit e48d4c56bbe7208e44bd9211b30f97c02ca1d45b
Author: Jamey Sharp <jamey at minilop.net>
Date:   Sat Feb 20 23:34:42 2010 -0800

    Revert spam.
    
    This reverts these commits:
    - 416ad5a20cb08e040bdb642a39123e8b2d9e2b69
    - 9b0b0400974ff3c264579ff0019c7629c202d332
    - 69713395cc8642c07d3c7d65054964b041a376f1
    - 9c1e622e038ea1b082a4bea7852dd186d8d59e8d
    - c27312e403a54bb3346b49da1c43b6f83ede2322
    - fa2003c25136b3ca8c9a20175a1d7d2b44b39969

diff --git a/Publications.mdwn b/Publications.mdwn
index 441cab9..f1df612 100644
--- a/Publications.mdwn
+++ b/Publications.mdwn
@@ -20,9 +20,4 @@ The authors are grateful to [[KeithPackard]] for his advice and assistance with
 
 In addition, we thank the [Usenix](http://www.usenix.org) Association for their financial and staff support of ALS and the XFree86 Technical Conference. A Student Stipend awarded by the Usenix Association made it possible for Jamey to attend the 2001 XFree86 Technical Conference.
 
-<<<<<<< HEAD:Publications.mdwn
-=======
-Finally, we are grateful to [Portland State University](http://www.pdx.edu), the [College of Engineering and Computer Science](http://www.cecs.pdx.edu), and particularly the [Computer Science Department](http://www.cs.pdx.edu) for their support and forbearance during this work. Bart's travel expenses for the 2001 XFree86 Technical Conference and for Usenix 2002 were paid by the PSU CS Dept., making it possible for him to attend. The University is also currently providing the bandwidth and rack space to host [freedesktop.org](http://www.freedesktop.org), including this project. [HP](http://hp.com) has generously provided the machine hosting `freedesktop.org`. 
-
-[online writing jobs](http://www.asiawriters.com) 
->>>>>>> a78511a1a7a9870ef6858e03635ac9cf2ef9890d:Publications.mdwn
+Finally, we are grateful to [Portland State University](http://www.pdx.edu), the [College of Engineering and Computer Science](http://www.cecs.pdx.edu), and particularly the [Computer Science Department](http://www.cs.pdx.edu) for their support and forbearance during this work. Bart's travel expenses for the 2001 XFree86 Technical Conference and for Usenix 2002 were paid by the PSU CS Dept., making it possible for him to attend. The University is also currently providing the bandwidth and rack space to host [freedesktop.org](http://www.freedesktop.org), including this project. [HP](http://hp.com) has generously provided the machine hosting `freedesktop.org`.