Revision: 6228
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6228&view=rev
Author: jdh2358
Date: 2008-10-16 19:35:12 +0000 (Thu, 16 Oct 2008)
Log Message:
-----------
fixed sidebar confict
Modified Paths:
--------------
trunk/matplotlib/doc/_templates/indexsidebar.html
Modified: trunk/matplotlib/doc/_templates/indexsidebar.html
===================================================================
--- trunk/matplotlib/doc/_templates/indexsidebar.html 2008-10-16 19:19:24 UTC
(rev 6227)
+++ trunk/matplotlib/doc/_templates/indexsidebar.html 2008-10-16 19:35:12 UTC
(rev 6228)
@@ -12,22 +12,10 @@
</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>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
