Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a8a0eeb

Browse files
committed
fixed sidebar confict
svn path=/trunk/matplotlib/; revision=6228
1 parent 8022c79 commit a8a0eeb

1 file changed

Lines changed: 0 additions & 12 deletions

File tree

doc/_templates/indexsidebar.html

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,10 @@ <h3>Download</h3>
1212
</p>
1313

1414
<h3>Need help?</h3>
15-
<<<<<<< .mine
16-
<<<<<<< .mine
17-
<p>Check the <a href="{{ pathto('contents') }}"}>docs</a>,
18-
the <a href="{{ pathto('faq/index') }}">faq</a>, and join the
19-
matplotlib
20-
mailing <a href="http://sourceforge.net/project/showfiles.php?group_id=80706">lists</a>.
21-
There is a also community wiki <a href=http://www.scipy.org/Cookbook/Matplotlib>cookbook</a></p>
22-
=======
23-
<p>Check the <a href="{{ pathto('users/index') }}"}>user</a> guide, the <a
24-
=======
2515
<p>Check the <a href="{{ pathto('users/index') }}">user</a> guide, the <a
26-
>>>>>>> .r6222
2716
href="{{ pathto('faq/index') }}">faq</a>, the <a href="{{
2817
pathto('api/index') }}"}>api</a> docs, <a href=http://www.nabble.com/matplotlib---users-f2906.html>archives</a>, and join the matplotlib mailing <a
2918
href="http://sourceforge.net/mail/?group_id=80706">lists</a>
30-
>>>>>>> .r6221
3119

3220
<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>
3321

0 commit comments

Comments
 (0)