From 8008554d519d7d38d9275a6f6ea3450068fc8387 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Fri, 12 Oct 2007 21:18:46 +0000
Subject: Fix NEWS

---
diff --git a/NEWS b/NEWS
index 0e8bbbf..b6ae410 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,6 @@
-<<<<<<< HEAD:NEWS
 * #2910 Open popups in the current window (marco)
-=======
 * Add agent-stylesheet.css and support for blocking flash. (tomeu)
 * Add support for agent and user stylesheets. (tomeu)
->>>>>>> d800b328ebea44310d6bb475c72f6a9e1557f13c:NEWS
 
 61
 
--
cgit v0.9.1