[gnomeweb-wml] Fixed merge conflict

[Jared L Jennings <jjennings src gnome org>]

commit f6067ac2cec64baa3e0b4594123e12ef2c735ab9
Author: Jared Jennings <jjennings novacoast com>
Date:   Mon May 6 12:34:55 2013 -0500

    Fixed merge conflict

 projects.gnome.org/tomboy/download.html |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/projects.gnome.org/tomboy/download.html b/projects.gnome.org/tomboy/download.html
index 8d03d44..6c12a49 100644
--- a/projects.gnome.org/tomboy/download.html
+++ b/projects.gnome.org/tomboy/download.html
@@ -111,11 +111,7 @@
       <h3>Latest release</h3>
       <img src="./images/package-x-generic.png" alt="source package" />
       Tomboy 1.15.1
-<<<<<<< HEAD
-        (<a href="http://ftp.gnome.org/pub/GNOME/sources/tomboy/1.13/tomboy-1.15.1.tar.xz";
-=======
         (<a href="http://ftp.gnome.org/pub/GNOME/sources/tomboy/1.15/tomboy-1.15.1.tar.xz";
->>>>>>> Updated download page with 1.15.1 release details
             title="Source code of the latest development release">tarball</a>)
         (<a href="http://ftp.gnome.org/pub/GNOME/binaries/win32/tomboy/1.15/Tomboy-1.15.1.msi";
             title="Windows build of the latest development release">Windows installer</a>)