diff options
| author | Morgan Collett <morgan.collett@gmail.com> | 2007-08-27 13:43:29 (GMT) |
|---|---|---|
| committer | Morgan Collett <morgan.collett@gmail.com> | 2007-08-27 13:43:29 (GMT) |
| commit | 3e50ac2a3377dbfa9b918e6f68ada7694145a03a (patch) | |
| tree | 3ade9f1219f2b77ca8629c77c5322cec44a9fea7 | |
| parent | 08e1bc0ceb1e0e91ace4c7633beff14310e078e5 (diff) | |
Fix conflict in NEWS
| -rw-r--r-- | NEWS | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -1,13 +1,9 @@ 16 -<<<<<<< HEAD/NEWS * Fix icon and roundbox changes in sugar (morgs) - -======= * Add greek translation (simosx) * Add arabic translation (khaled) ->>>>>>> 2595c9996dfb42180c68bd75a27118f1693e561c/NEWS 15 * Rename buddy icon (morgs) |