From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 23 Jul 2009 05:23:26 +0000 (+0200)
Subject: Fix merge problems
X-Git-Tag: build37~49
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=91a5888ad22ff93d212c9534d720d8f8bf52e56b

Fix merge problems
---

diff --git a/src/language/stats/roc.c b/src/language/stats/roc.c
index 4cd593a2..1d61a55c 100644
--- a/src/language/stats/roc.c
+++ b/src/language/stats/roc.c
@@ -962,9 +962,9 @@ show_auc  (struct roc_state *rs, const struct cmd_roc *roc)
       tab_text (tbl, n_cols - 2, 1, TAT_TITLE, _("Lower Bound"));
       tab_text (tbl, n_cols - 1, 1, TAT_TITLE, _("Upper Bound"));
 
-      tab_joint_text (tbl, n_cols - 2, 0, 4, 0,
-		      TAT_TITLE | TAB_CENTER | TAT_PRINTF,
-		      _("Asymp. %g%% Confidence Interval"), roc->ci);
+      tab_joint_text_format (tbl, n_cols - 2, 0, 4, 0,
+			     TAT_TITLE | TAB_CENTER,
+			     _("Asymp. %g%% Confidence Interval"), roc->ci);
       tab_vline (tbl, 0, n_cols - 1, 0, 0);
       tab_hline (tbl, TAL_1, n_cols - 2, n_cols - 1, 1);
     }