kpriv/pkgsrc-wip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

FIX: somebody commited <<<< ==== >>>> lines indicating merge conflicts

Browse source
This commit is contained in:
Aleksey Cheusov 2010-08-13 20:40:49 +00:00 committed by Thomas Klausner
parent 3a518a0b08
commit c06841ef0e
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
TODO
View file

@ -1,5 +1,3 @@
<<<<<<< TODO
=======
Suggested package updates
=========================
@ -162,4 +160,3 @@ Suggested fixes
===============
o xscreensaver, PR 43047
>>>>>>> 1.610