[QGIS Commit] r8623 - docs/trunk/english_us/user_guide

[svn_qgis at osgeo.org]

Author: taraathan
Date: 2008-06-07 21:08:29 -0400 (Sat, 07 Jun 2008)
New Revision: 8623

Modified:
   docs/trunk/english_us/user_guide/conventions.tex
Log:
testing conflict resolution in svn

Modified: docs/trunk/english_us/user_guide/conventions.tex
===================================================================
--- docs/trunk/english_us/user_guide/conventions.tex	2008-06-08 01:02:04 UTC (rev 8622)
+++ docs/trunk/english_us/user_guide/conventions.tex	2008-06-08 01:08:29 UTC (rev 8623)
@@ -1,5 +1,6 @@
 % vim: set textwidth=78 autoindent:
 
+% testing testing
 % testing svn commit
 % options for boxes provided by fancybox package are:
 % \fbox, \shadowbox, \doublebox, \ovalbox and \Ovalbox