aboutsummaryrefslogtreecommitdiffstats
path: root/interfaces
diff options
context:
space:
mode:
authorChris Ball <cjb@laptop.org>2012-01-02 15:43:13 -0500
committerChris Ball <cjb@laptop.org>2012-01-02 15:43:13 -0500
commitb1527580ece00959b9e9d90e8f0f7dd1bce0342a (patch)
treebda1bfc4c43e8ef9ee748d6af0e622aa282e9cbb /interfaces
parentbf52e18aad6e0e8effcadc6b90dfedf4d15b1859 (diff)
downloadbugseverywhere-b1527580ece00959b9e9d90e8f0f7dd1bce0342a.tar.gz
Fix up broken merge commit.
Diffstat (limited to 'interfaces')
-rw-r--r--interfaces/web/web.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/interfaces/web/web.py b/interfaces/web/web.py
index dcb205b..a99758c 100644
--- a/interfaces/web/web.py
+++ b/interfaces/web/web.py
@@ -78,11 +78,7 @@ class WebInterface:
if targetbug == None:
return []
bugs = [bug for bug in get_blocked_by(self.bd, targetbug) if
-<<<<<<< HEAD
- bug.status not in ('closed', 'fixed', 'wontfix')]
-=======
bug.active]
->>>>>>> 8f1cd4f5eecba8e3322ea6725d71e430520d1585
return bugs
@@ -189,9 +185,6 @@ class WebInterface:
bug.severity = severity if severity != 'None' else None
if target:
-<<<<<<< HEAD
- add_target(self.bd, bug, target)
-=======
current_target = bug_target(self.bd, bug)
if current_target:
remove_target(self.bd, bug)
@@ -199,7 +192,6 @@ class WebInterface:
add_target(self.bd, bug, target)
else:
add_target(self.bd, bug, target)
->>>>>>> 8f1cd4f5eecba8e3322ea6725d71e430520d1585
bug.save()