one more merge conflict that was missed

sagemath · May 24, 2014 · eba4566 · eba4566
1 parent bf4094d
commit eba4566
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/src/sage/coding/linear_code.py b/src/sage/coding/linear_code.py
@@ -1660,8 +1660,6 @@ def decode(self, right, algorithm="syndrome"):
             from sage.interfaces.gap import gfq_gap_to_sage
             result = [gfq_gap_to_sage(v, self.base_ring()) for v in result]
             return self.ambient_space()(result)
-        else:
-            raise NotImplementedError("Only 'syndrome','nearest neighbor','guava' are implemented.")
 
     def divisor(self):
         r"""