# HG changeset patch
# User Joseph Turian <turian@iro.umontreal.ca>
# Date 1224104435 14400
# Node ID 8cde974b648666c01b399c04dc02c7537abbd931
# Parent  121cc6db448194bb6120a58e2af02fce18e3ae24# Parent  7554bc99096a9f1e950b04cc6400e7d821868ab4
merge

diff -r 121cc6db4481 -r 8cde974b6486 __init__.py
--- a/__init__.py	Wed Oct 15 17:00:26 2008 -0400
+++ b/__init__.py	Wed Oct 15 17:00:35 2008 -0400
@@ -1,5 +1,4 @@
 import filetensor
-import nnet_ops
 import version
 import learner