8 lines
149 B
Plaintext
8 lines
149 B
Plaintext
<<<<<<< .cvsignore
|
|
gnome-menus-2.11.91.tar.bz2
|
|
gnome-menus-2.12.0.tar.bz2
|
|
=======
|
|
gnome-menus-2.12.0.tar.bz2
|
|
>>>>>>> 1.10
|
|
gnome-menus-2.13.5.tar.bz2
|