Remove left over conflict markers from documentation.

Closes #14404.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h
index 7c68512a2307af7b6f1340a97b11d1939c775f38..b3a77c696517ad298b01d5ca4ce8224669f6357c 100644 (file)
--- a/interface/wx/propgrid/property.h
+++ b/interface/wx/propgrid/property.h
@@ -431,13 +431,8 @@ wxPG_PROP_BEING_DELETED             = 0x00200000
     @subsection wxBoolProperty
 
     Represents a boolean value. wxChoice is used as editor control, by the
     @subsection wxBoolProperty
 
     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
     use check box instead.
     default. wxPG_BOOL_USE_CHECKBOX attribute can be set to true in order to
     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.
         Default behaviour is to do nothing.
         Converts integer to a value, and if successful, calls SetValue() on it.
         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
             Int to get the value from.
 
         @param value
             Int to get the value from.