Merge branch 'master' of https://github.com/MITSustainableDesignLab/u…

…midocs
MITSustainableDesignLab · Oct 4, 2017 · 9d84618 · 9d84618
2 parents a3d98ff + 931f0fe
commit 9d84618
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/docs/template-detail.rst b/docs/template-detail.rst
@@ -50,13 +50,16 @@ Opaque
 ------------
 Conductivity
 ------------
+<<<<<<< HEAD
 .. module:: sample
     :platform: Unix, Windows
     :synopsis: sample of documented python code
 
 .. currentmodule:: sample
 .. autofunction:: conf
 
+=======
+>>>>>>> 931f0fefdd04791ed959b79399bffc886625109b
 ----
 Cost
 ----