applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove conflict markers.

Browse source
This commit is contained in:
Nuno Ferreira 1999-06-16 00:32:18 +00:00
parent 70575c34d2
commit a971cc41bf
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -201,7 +201,6 @@
the default WM so the gnome-wm script can write the chosen WM the default WM so the gnome-wm script can write the chosen WM
there. there.
>>>>>>> 1.178
1999-03-22 Jonathan Blandford <jrb@redhat.com> 1999-03-22 Jonathan Blandford <jrb@redhat.com>
* capplets/screensaver-properties/: removed print statements. * capplets/screensaver-properties/: removed print statements.
@ -212,7 +211,6 @@ Sun Mar 21 01:33:55 CST 1999 Frank Belew <frb@umr.edu>
* capplets/gnome-edit-properties/gnome-edit-properties.c: * capplets/gnome-edit-properties/gnome-edit-properties.c:
added Nedit to the list added Nedit to the list
>>>>>>> 1.174
Tue Mar 16 17:54:04 1999 Timur Bakeyev <mc@bat.ru> Tue Mar 16 17:54:04 1999 Timur Bakeyev <mc@bat.ru>
* capplets/wm-properties/wm-list.c: Add missed #include <sys/types.h> * capplets/wm-properties/wm-list.c: Add missed #include <sys/types.h>