From f2c1511f11a09b845c1792d6da270cdc2817cf89 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 9 Jan 1996 10:51:59 +0000 Subject: [PATCH] Risolto conflitto git-svn-id: svn://10.65.10.50/trunk@2409 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/form.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/form.cpp b/include/form.cpp index 658034057..c262b2ed4 100755 --- a/include/form.cpp +++ b/include/form.cpp @@ -910,14 +910,12 @@ void TForm_item::set_picture(const char*) CHECK(0, "Can't set the picture of a generic form item!"); } -<<<<<<< form.cpp TToken_string& TForm_item::memo_info() { CHECK(0, "Can't get a memo of a generic form item!"); return TToken_string(); } - short TForm_item::x() { if (_section == NULL || !_section->columnwise())