root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Risolto conflitto

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@2409 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1996-01-09 10:51:59 +00:00
parent ced49ce2bd
commit f2c1511f11
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/form.cpp
View File

@ -910,14 +910,12 @@ void TForm_item::set_picture(const char*)
CHECK(0, "Can't set the picture of a generic form item!"); CHECK(0, "Can't set the picture of a generic form item!");
} }
<<<<<<< form.cpp
TToken_string& TForm_item::memo_info() TToken_string& TForm_item::memo_info()
{ {
CHECK(0, "Can't get a memo of a generic form item!"); CHECK(0, "Can't get a memo of a generic form item!");
return TToken_string(); return TToken_string();
} }
short TForm_item::x() short TForm_item::x()
{ {
if (_section == NULL || !_section->columnwise()) if (_section == NULL || !_section->columnwise())