fixed sidebar confict

jdh2358 · jdh2358 · commit a8a0eeb8750c · 2008-10-16T19:35:12.000Z
svn path=/trunk/matplotlib/; revision=6228
diff --git a/doc/_templates/indexsidebar.html b/doc/_templates/indexsidebar.html
@@ -12,22 +12,10 @@ <h3>Download</h3>
 </p>
 
 <h3>Need help?</h3>
-<<<<<<< .mine
-<<<<<<< .mine
-<p>Check the <a href="{{ pathto('contents') }}"}>docs</a>,
-the <a href="{{ pathto('faq/index') }}">faq</a>, and join the
-matplotlib
-mailing <a href="http://sourceforge.net/project/showfiles.php?group_id=80706">lists</a>.
-There is a also community wiki <a href=http://www.scipy.org/Cookbook/Matplotlib>cookbook</a></p>
-=======
-<p>Check the <a href="{{ pathto('users/index') }}"}>user</a> guide, the <a
-=======
 <p>Check the <a href="{{ pathto('users/index') }}">user</a> guide, the <a
->>>>>>> .r6222
 href="{{ pathto('faq/index') }}">faq</a>, the <a href="{{
 pathto('api/index') }}"}>api</a> docs, <a href=http://www.nabble.com/matplotlib---users-f2906.html>archives</a>, and join the matplotlib  mailing  <a
 href="http://sourceforge.net/mail/?group_id=80706">lists</a>
->>>>>>> .r6221
 
 <p>You can file bugs, patches and feature requests on the sourceforge <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a>, but it is a good idea to ping us on the mailing list too.</p>
 
