#664 fix docs

pybamm-team · Oct 25, 2019 · 0a7d5f7 · 0a7d5f7
1 parent 8c12675
commit 0a7d5f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/docs/source/expression_tree/index.rst b/docs/source/expression_tree/index.rst
@@ -17,10 +17,4 @@ Expression Tree
   broadcasts
   functions
   interpolant
-<<<<<<< HEAD
   operations/index
-=======
-  evaluate
-  simplify
-  jacobian
->>>>>>> master
diff --git a/pybamm/models/base_model.py b/pybamm/models/base_model.py
@@ -73,12 +73,13 @@ class BaseModel(object):
         algebraic equations, Jacobain (if using) and events into a different format:
 
         - None: keep PyBaMM expression tree structure.
-        - "python": convert into pure python code that will calculate the result of
+        - "python": convert into pure python code that will calculate the result of \
         calling `evaluate(t, y)` on the given expression treeself.
-        - "casadi": convert into CasADi expression tree, which then uses CasADi's
+        - "casadi": convert into CasADi expression tree, which then uses CasADi's \
         algorithm to calculate the Jacobian.
 
         Default is "python".
+
     """
 
     def __init__(self, name="Unnamed model"):