Changeset 2824


Ignore:
Timestamp:
05/25/07 11:41:43 (13 years ago)
Author:
sorber
Message:

(sorry) Removed left-over conflict marks.

Location:
trunk/loci/visbio/overlays
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/visbio/overlays/OverlayBox.java

    r2823 r2824  
    146146    float perim = width + width + height + height; 
    147147 
    148 <<<<<<< .mine 
    149148    if (name.equals(COORDS)) { 
    150149      return "(" + x1 + ", " + y1 + ")-(" + x2 + ", " + y2 + ")"; 
    151150    } else if (name.equals(CTR)){ 
    152 ======= 
    153     if (name.equals("Coordinates")) { 
    154       return "(" + x1 + ", " + y1 + ")-(" + x2 + ", " + y2 + ")"; 
    155     } 
    156     else if (name.equals("Center")) { 
    157 >>>>>>> .r2766 
    158151      return "(" + centerX + ", " + centerY + ")"; 
    159152    } 
  • trunk/loci/visbio/overlays/OverlayNodedObject.java

    r2823 r2824  
    1 <<<<<<< .mine 
    21// 
    32// OverlayNodedObject.java 
Note: See TracChangeset for help on using the changeset viewer.