LDP
/
LDP
mirror of https://github.com/tLDP/LDP
0
1
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:martin-a-brown/LDP 

Conflicts:
	LDP/guide/docbook/LDP-Author-Guide/LDP-Author-Guide.xml
accepting upstream
This commit is contained in:
Martin A. Brown 2016-01-27 12:30:12 -08:00
parent 86939feccc ac2bb8980c
commit e1b7301aca
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LDP/guide/docbook/LDP-Author-Guide/LDP-Author-Guide.xml
View File

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