Changeset 2355

Timestamp:

Feb 8, 2006, 3:22:26 PM (19 years ago)

Author:

ole

Message:

test of conflicts

File:

• documentation/AnuGA_user_manual.tex (modified) (1 diff)

documentation/AnuGA_user_manual.tex

@@ -38 +38 @@
 % Find out how to change date format
 % Relabel sections, subsections
-
+Make conflict here
 %\setlength{\parindent}{0mm} %\setlength{\parskip}{3pt}
 %\setlength{\oddsidemargin}{0.6in}\setlength{\evensidemargin}{0.6in}