Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
1 files changed, 0 insertions, 3 deletions
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