poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n...@apache.org
Subject svn commit: r1754693 - /poi/site/src/documentation/content/xdocs/spreadsheet/quick-guide.xml
Date Mon, 01 Aug 2016 00:07:58 GMT
Author: nick
Date: Mon Aug  1 00:07:58 2016
New Revision: 1754693

URL: http://svn.apache.org/viewvc?rev=1754693&view=rev
Log:
Remove svn merge parts

Modified:
    poi/site/src/documentation/content/xdocs/spreadsheet/quick-guide.xml

Modified: poi/site/src/documentation/content/xdocs/spreadsheet/quick-guide.xml
URL: http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/spreadsheet/quick-guide.xml?rev=1754693&r1=1754692&r2=1754693&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/spreadsheet/quick-guide.xml (original)
+++ poi/site/src/documentation/content/xdocs/spreadsheet/quick-guide.xml Mon Aug  1 00:07:58
2016
@@ -76,11 +76,8 @@
                     <li><link href="#Hiding">Hiding and Un-Hiding Rows</link></li>
                     <li><link href="#CellProperties">Setting Cell Properties</link></li>
                     <li><link href="#PivotTable">Create a Pivot Table</link></li>
-<<<<<<< .mine
                     <li><link href="#DrawingBorders">Drawing Borders</link></li>
-=======
                     <li><link href="#RichText">Cells with multiple styles</link></li>
->>>>>>> .r1748322
                 </ul>
             </section>
             <section><title>Features</title>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message