clean up merge cruft

wholmgren · wholmgren · commit fe5d021bcf8f · 2016-01-30T21:42:03.000-07:00
diff --git a/docs/sphinx/source/index.rst b/docs/sphinx/source/index.rst
@@ -61,16 +61,11 @@ Contents
    
    self
    package_overview
+   whatsnew
    modules
    classes
    comparison_pvlib_matlab
-<<<<<<< HEAD
-   whatsnew
-=======
    variables_style_rules
-   pvlib
-
->>>>>>> pvlib/master
 
 
 Indices and tables
