diff options
| author | Thomas Thurman <thomas@thurman.org.uk> | 2007-04-08 18:17:38 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2007-04-08 18:17:38 +0000 |
| commit | 82c56cb5d7799d94c72bdd8cf409333014204493 (patch) | |
| tree | 57886cf571b60d6ec499c51d99b8c0bcb6698a36 | |
| parent | 0a8bdcdcb3823442ddde34e49967860cefabdcc3 (diff) | |
| download | metacity-82c56cb5d7799d94c72bdd8cf409333014204493.tar.gz | |
removed conflict line.
2007-04-08 Thomas Thurman <thomas@thurman.org.uk>
* ChangeLog: removed conflict line.
svn path=/trunk/; revision=3175
| -rw-r--r-- | ChangeLog | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2007-04-08 Thomas Thurman <thomas@thurman.org.uk> + + * ChangeLog: removed conflict line. + 2007-04-07 Elijah Newren <newren gmail com> * src/prefs.[ch] (screen_bindings array, @@ -224,7 +228,6 @@ * src/window.c (meta_window_new_with_attrs): new hooks to handle new atom ->>>>>>> .r3171 2007-03-26 Josselin Mouette <joss@malsain.org> * src/session.c (meta_session_init): if previous client ID |