X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e610e1caf91dee9e074551149e3ae5e08df9c09..b09857ae000a60704207d63290be937584805fb0:/interface/wx/propgrid/property.h

diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h
index 6d2b249687..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
 
@@ -517,7 +512,7 @@ wxPG_PROP_BEING_DELETED             = 0x00200000
     wxDateTime property. Default editor is DatePickerCtrl, although TextCtrl
     should work as well. wxPG_DATE_FORMAT attribute can be used to change
     string wxDateTime::Format uses (although default is recommended as it is
-    locale-dependant), and wxPG_DATE_PICKER_STYLE allows changing window
+    locale-dependent), and wxPG_DATE_PICKER_STYLE allows changing window
     style given to DatePickerCtrl (default is wxDP_DEFAULT|wxDP_SHOWCENTURY).
     Using wxDP_ALLOWNONE will enable better unspecified value support.
 
@@ -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.