[grisbi-cvs] grisbi/src gsb_real.c,1.60,1.61

[Gunee]

Update of /cvsroot/grisbi/grisbi/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv29734/src

Modified Files:
	gsb_real.c 
Log Message:
Conflict solved


Index: gsb_real.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_real.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- gsb_real.c	10 Dec 2009 15:06:47 -0000	1.60
+++ gsb_real.c	10 Dec 2009 15:54:38 -0000	1.61
@@ -373,10 +373,10 @@
                        ? strlen ( mon_thousands_sep )
                        : 0;
     mdp_len = mon_decimal_point ? strlen ( mon_decimal_point ) : 0;
-	if ( !strchr ( mon_thousands_sep, '.' ))
-		decimal_chars = g_strconcat(".", mon_decimal_point, NULL);
-	else
-		decimal_chars = g_strdup(mon_decimal_point);
+    if ( !strchr ( mon_thousands_sep, '.' ))
+        decimal_chars = g_strconcat(".", mon_decimal_point, NULL);
+    else
+        decimal_chars = g_strdup(mon_decimal_point);
 	space_chars = g_strconcat(" ", mon_thousands_sep, NULL);
 
     for ( ; ; )