Remove stray conflict marker

mojomojo · Jan 30, 2009 · 8a5eee4 · 8a5eee4
1 parent b530d92
commit 8a5eee4
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/Changes b/Changes
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:Changes
 0.999027 2009-01-30 23:17:00
         - Fixed broken authors (users) pager links.
         - Added "Split Edit" for side-by-side view/edit.