Merge branch 'week15' of https://github.com/amitjamadagni/sage into t…

…/17030/knots Conflicts: src/sage/all.py
sagemath · Sep 23, 2014 · 50abd99 · 50abd99
2 parents 325da8b + 106e1d3
commit 50abd99
Show file tree

Hide file tree

Showing 4 changed files with 1,756 additions and 0 deletions.
diff --git a/src/sage/all.py b/src/sage/all.py
@@ -171,7 +171,11 @@
 
 from sage.matroids.all import *
 
+<<<<<<< HEAD
 from sage.game_theory.all import *
+=======
+from sage.knots.all import *
+>>>>>>> 106e1d31a69335c434a5ef5b1646e0aa381d6d8a
 
 # Lazily import notebook functions and interacts (#15335)
 lazy_import('sagenb.notebook.notebook_object', 'notebook')

diff --git a/src/sage/knots/__init__.py b/src/sage/knots/__init__.py
diff --git a/src/sage/knots/all.py b/src/sage/knots/all.py
@@ -0,0 +1 @@
+from sage.knots.link import Link