Browse files

Remove stray conflict marker

  • Loading branch information...
1 parent b530d92 commit 8a5eee4f9782631087893c53823282c2e01c63a6 @marcusramberg marcusramberg committed Jan 31, 2009
Showing with 0 additions and 1 deletion.
  1. +0 −1 Changes
View
1 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.

0 comments on commit 8a5eee4

Please sign in to comment.