[ jEdit-CVS ] plugins/SideKick users-guide.xml,1.42,1.43

[Dale A. <dal...@us...>]

Update of /cvsroot/jedit/plugins/SideKick
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24728

Modified Files:
	users-guide.xml 
Log Message:
fixed my screwup from last checkin.



Index: users-guide.xml
===================================================================
RCS file: /cvsroot/jedit/plugins/SideKick/users-guide.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- users-guide.xml	13 Jun 2006 21:46:52 -0000	1.42
+++ users-guide.xml	13 Jun 2006 22:19:28 -0000	1.43
@@ -321,19 +321,6 @@
 
  <itemizedlist>
 
- <listitem> <para>
-  <emphasis role="bold">Version 0.6.1</emphasis> requires
-  jEdit 4.3pre3 and ErrorListPlugin 1.2. 
-  <itemizedlist>
-  
-  <listitem><para> Made <varname>SideKickParser.name</varname> <literal>protected</literal>.
-  </para></listitem>
-  <listitem><para> Bug 1504746 fixed [combobox]. </para></listitem>
-  </itemizedlist>
-  
-  </para></listitem>
- 
-<<<<<<< users-guide.xml
   <listitem>
  <para>
  <emphasis role="bold">Version 0.6.2</emphasis> requires
@@ -349,6 +336,19 @@
  </itemizedlist>
  </para>
  </listitem>
+ 
+ <listitem> <para>
+  <emphasis role="bold">Version 0.6.1</emphasis> requires
+  jEdit 4.3pre3 and ErrorListPlugin 1.2. 
+  <itemizedlist>
+  
+  <listitem><para> Made <varname>SideKickParser.name</varname> <literal>protected</literal>.
+  </para></listitem>
+  <listitem><para> Bug 1504746 fixed [combobox]. </para></listitem>
+  </itemizedlist>
+  
+  </para></listitem>
+ 
 
   <listitem>
  <para>