diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-10-12 21:18:46 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-10-12 21:18:46 (GMT) |
commit | 8008554d519d7d38d9275a6f6ea3450068fc8387 (patch) | |
tree | f71154e820f7af406a1abc0c724f7f7214dd0d98 | |
parent | 502b3321716ff063e1992c35cb28483da48b0dd6 (diff) |
Fix NEWS
-rw-r--r-- | NEWS | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -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 |