X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8cddee2d0ec042b15e633944a0c30dae77357175..7344108e8a129a3f9b4df5ab0f98a1713db03b89:/interface/wx/propgrid/property.h

diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h
index 7c68512a23..b3a77c6965 100644
--- 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
-<<<<<<< .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.
->>>>>>> .r67279
 
     @subsection wxLongStringProperty
 
@@ -842,13 +837,8 @@ public:
     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 behavior is to do nothing.
->>>>>>> .r67279
 
         @param value
             Int to get the value from.