[Xcb-commit] Publications.mdwn

[XCB site]

 Publications.mdwn |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 9c1e622e038ea1b082a4bea7852dd186d8d59e8d
Author: lolo <lolo at web>
Date:   Sat Feb 20 23:15:14 2010 -0800

diff --git a/Publications.mdwn b/Publications.mdwn
index f9d3fbe..d7306e4 100644
--- a/Publications.mdwn
+++ b/Publications.mdwn
@@ -20,4 +20,8 @@ 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`. [http://www.asiawriters.com online writing jobs]
+=======
+Finally, we are grateful to [Portland State University](http://www.pdx.edu)[online writing jobs](http://www.asiawriters.com) , 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`. 
+>>>>>>> a78511a1a7a9870ef6858e03635ac9cf2ef9890d:Publications.mdwn