typo

theano/compile/tests/test_function_module.py

@@ -255,26 +255,18 @@ class T_function(unittest.TestCase):
         fgraph_ori = ori.maker.fgraph
         fgraph_cpy = cpy.maker.fgraph
 
-<<<<<<< HEAD
         # assert intermediate and Constants storages are shared. 
         # and output stoarges are not shared
-=======
-        # assert intermediate and Constants storages are shared
->>>>>>> 4acf04b... Add some docs to FunctionGraph and minor changes of function_module.copy()
         i_o_variables = fgraph_cpy.inputs + fgraph_cpy.outputs
         ori_storages = storage_map_ori.values()
         for key in storage_map_cpy.keys():
             storage = storage_map_cpy[key]
             storage_is_shared = any([ storage is s for s in ori_storages])
             if key not in i_o_variables or isinstance(key, theano.tensor.Constant):
-<<<<<<< HEAD
                 self.assertTrue(storage_is_shared)
             elif key in fgraph_cpy.outputs:
                 self.assertFalse(storage_is_shared)
-=======
-                storage = storage_map_cpy[key]
-                self.assertTrue( any([ storage is s for s in ori_storages]))
->>>>>>> 4acf04b... Add some docs to FunctionGraph and minor changes of function_module.copy()
+
 
         # assert storages of SharedVariable without updates are shared
         for (input, _1, _2), here, there in zip(ori.indices,

theano/gof/fg.py

@@ -842,11 +842,15 @@ class FunctionGraph(utils.object2):
             self.check_integrity()
         e = FunctionGraph([equiv[i] for i in self.inputs],
                           [equiv[o] for o in self.outputs],
+<<<<<<< HEAD
 <<<<<<< HEAD
                           clone=False)
 =======
                           clone=Flase)
 >>>>>>> b2901d0... Fix a bug: While initializing a clone graph it should not be cloned again, otherwise the equiv doesn't work.
+=======
+                          clone=False)
+>>>>>>> 73ae5ae... typo
         if check_integrity:
             e.check_integrity()