fixed conflict, preferring mkomarinski source

This commit is contained in:
Martin A. Brown 2016-01-27 11:47:31 -08:00
commit ac2bb8980c
1 changed files with 2 additions and 1 deletions

View File

@ -159,7 +159,8 @@
<authorinitials>MG</authorinitials> <authorinitials>MG</authorinitials>
<revremark>Added notes about prefered submission formats, <revremark>Added notes about prefered submission formats,
corrected links, packaged templates.</revremark> corrected links, packaged templates.</revremark>
</revision> </revision>
<revision> <revision>
<revnumber>4.7</revnumber> <revnumber>4.7</revnumber>
<date>2005-03-04</date> <date>2005-03-04</date>