[gnumeric] Fix merge accident.

[Jean Bréfort <jbrefort src gnome org>]

commit 00944b72b861895ee3c027db9149adb7b475c3c1
Author: Jean Brefort <jean brefort normalesup org>
Date:   Mon Oct 27 16:47:36 2014 +0100

    Fix merge accident.

 plugins/openoffice/openoffice-write.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index ad8ddde..9108759 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -6214,13 +6214,8 @@ odf_write_data_element_range (GnmOOExport *state,  GnmParsePos *pp, GnmExprTop c
                GString *gstr = g_string_new (NULL);
                for (i = 0; i < expr->set.argc; i++) {
                        GnmExpr const *expr_arg = expr->set.argv[i];
-<<<<<<< HEAD
-                       if (GNM_EXPR_GET_OPER (expr_arg) == GNM_EXPR_OP_CONSTANT && 
-                           VALUE_IS_CELLRANGE (expr_arg->constant.value)) {
-=======
                        if (GNM_EXPR_GET_OPER (expr_arg) == GNM_EXPR_OP_CONSTANT &&
-                           expr_arg->constant.value->type == VALUE_CELLRANGE) {
->>>>>>> Use goc_canvas_invalidate_region() for ants walking.
+                           VALUE_IS_CELLRANGE (expr_arg->constant.value)) {
                                char *str = gnm_expr_as_string (expr_arg, pp, state->conv);
                                if (gstr->len > 0)
                                        g_string_append_c (gstr, ' ');