Changeset 9759:71c48283a01c in orange


Ignore:
Timestamp:
02/06/12 17:06:07 (2 years ago)
Author:
anze <anze.staric@…>
Branch:
default
Message:

Fixed failed merge attempt.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • Orange/distance/__init__.py

    r9753 r9759  
    2020    ExamplesDistanceConstructor_Relief as Relief 
    2121 
    22 <<<<<<< local 
    2322from Orange import statc 
    24 ======= 
    2523from Orange.misc import progress_bar_milestones 
    2624 
    27 import statc 
    28 >>>>>>> other 
    2925import numpy 
    3026from numpy import linalg 
Note: See TracChangeset for help on using the changeset viewer.