2014/index.html: removed the merge conflict text.
authorrsiddharth <rsd@gnu.org>
Mon, 25 Nov 2013 17:34:16 +0000 (23:04 +0530)
committerrsiddharth <rsd@gnu.org>
Mon, 25 Nov 2013 17:34:16 +0000 (23:04 +0530)
commit7434f8805724d9e5fef8a8032db5f643a8cb44d9
tree2f11cf7bbed487487eb78c24a87cdec339055720
parent7318f3c781ed3a26957147c3ac87c28f2ad7b04f
2014/index.html: removed the merge conflict text.
2014/index.html