From 502b3321716ff063e1992c35cb28483da48b0dd6 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Fri, 12 Oct 2007 21:10:57 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity

Conflicts:

	NEWS
	browser.py
---
(limited to 'NEWS')

diff --git a/NEWS b/NEWS
index 0f1efd1..0e8bbbf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,9 @@
+<<<<<<< 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