Merge branch 'jc/conflict-marker-size'
[gitweb.git] / RelNotes
index 5274ceed4e7ecd0210ad8338a0b3570e3648b05e..7b9bde663bd5b2b8eec6b7e91c1de275f6afa460 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.6.6.txt
\ No newline at end of file
+Documentation/RelNotes-1.7.0.txt
\ No newline at end of file