luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove leftover svn conflict indicator.

Browse Source 
svn path=/trunk/; revision=6908
This commit is contained in:
Tor Lillqvist 2008-05-18 19:46:49 +00:00
parent 4b06cf6ce9
commit 78bdc9397b
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -60,7 +60,6 @@
* glib/gi18n.c: #include <locale.h> to fix the build. * glib/gi18n.c: #include <locale.h> to fix the build.
>>>>>>> .r6902
2008-05-12 Yair Hershkovitz <yairhr@gmail.com> 2008-05-12 Yair Hershkovitz <yairhr@gmail.com>
* glib/gi18n.c (g_i18n_init): Coding convention fix. Space between * glib/gi18n.c (g_i18n_init): Coding convention fix. Space between