Version 3.1.4

upload/ips_kernel/PEAR/Text/Diff/ThreeWay.php

@@ -2,9 +2,9 @@
 /**
  * A class for computing three way diffs.
  *
- * $Horde: framework/Text_Diff/Diff/ThreeWay.php,v 1.3.2.3 2008/01/04 10:37:27 jan Exp $
+ * $Horde: framework/Text_Diff/Diff/ThreeWay.php,v 1.3.2.4 2009/01/06 15:23:41 jan Exp $
  *
- * Copyright 2007-2008 The Horde Project (http://www.horde.org/)
+ * Copyright 2007-2009 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (LGPL). If you did
  * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
@@ -57,7 +57,7 @@ class Text_Diff_ThreeWay extends Text_Diff {
         $lines = array();
         foreach ($this->_edits as $edit) {
             if ($edit->isConflict()) {
-                /* FIXME: this should probably be moved somewhere else. */
+                
                 $lines = array_merge($lines,
                                      array('<<<<<<<' . ($label1 ? ' ' . $label1 : '')),
                                      $edit->final1,