mirror of https://github.com/tLDP/LDP
fixed conflict, preferring mkomarinski source
This commit is contained in:
commit
ac2bb8980c
|
@ -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>
|
||||||
|
|
Loading…
Reference in New Issue