Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove left over conflict markers from documentation.

Browse Source 
Closes #14404.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-06-15 23:23:20 +00:00
parent 95fbc73897
commit d6cf9064d4
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
interface/wx/propgrid/property.h
View File

@@ -431,13 +431,8 @@ wxPG_PROP_BEING_DELETED = 0x00200000
@subsection wxBoolProperty @subsection wxBoolProperty
Represents a boolean value. wxChoice is used as editor control, by the Represents a boolean value. wxChoice is used as editor control, by the
<<<<<<< .mine
default. wxPG_BOOL_USE_CHECKBOX attribute can be set to true in order to default. wxPG_BOOL_USE_CHECKBOX attribute can be set to true in order to
use check box instead. use check box instead.
=======
default. wxPG_BOOL_USE_CHECKBOX attribute can be set to true in order to use
check box instead.
>>>>>>> .r67279
@subsection wxLongStringProperty @subsection wxLongStringProperty
@@ -842,13 +837,8 @@ public:
bool SetValueFromString( const wxString& text, int flags = 0 ); bool SetValueFromString( const wxString& text, int flags = 0 );
/** /**
<<<<<<< .mine
Converts integer to a value, and if successful, calls SetValue() on it. Converts integer to a value, and if successful, calls SetValue() on it.
Default behaviour is to do nothing. Default behaviour is to do nothing.
=======
Converts integer to a value, and if successful, calls SetValue() on it.
Default behavior is to do nothing.
>>>>>>> .r67279
@param value @param value
Int to get the value from. Int to get the value from.