oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean up left over merge marker

Browse source
This commit is contained in:
Graham Knop 2010-06-20 04:39:54 -05:00
parent 90dfb83d9d
commit e1f06880a0
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/gotcha.txt
View file

@ -128,8 +128,6 @@ save you many hours of grief.
prefix from the filename.
>>>>>>> master
7.8.0
--------------------------------------------------------------------