[libical-glib] Update i-cal-property.xml

[Miao Yu <williamyu src gnome org>]

commit cf60b482502ef8d23c21409490a1cbf79f097ffd
Author: William Yu <williamyu gnome org>
Date:   Sun Apr 3 14:01:02 2016 -0700

    Update i-cal-property.xml

 TODO                       |   19 +++++++++++++++++--
 src/api/i-cal-property.xml |    7 +++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/TODO b/TODO
index 8624e3c..f6127bf 100644
--- a/TODO
+++ b/TODO
@@ -95,8 +95,6 @@ i-cal-recurrence-type.xml
 i-cal-reqstat-type.xml 
 i-cal-restriction.xml 
 i-cal-trigger-type.xml 
-i-cal-unknowntokenhandling.xml 
-i-cal-value.xml
 
 Done:
 i-cal-component.xml
@@ -117,6 +115,17 @@ i-cal-timezone-phase.xml
 i-cal-timezonetype.xml
 i-cal-timezone.xml 
 i-cal-enums.xml 
+i-cal-error.xml 
+i-cal-geo-type.xml 
+i-cal-parameter.xml 
+i-cal-langbind.xml (ignore, for language binding)
+i-cal-memory.xml (ignore, low-level)
+i-cal-mime.xml
+i-cal-parser.xml 
+i-cal-period-type.xml
+i-cal-unknowntokenhandling.xml 
+i-cal-value.xml
+i-cal-property.xml 
 
 Upgrade results:
 icalcomponent.h
@@ -233,3 +242,9 @@ i-cal-timezone
        icaltimezone_get_tznames_from_vtimezone
        i_cal_timezone_set_builtin_tzdata
        i_cal_timezone_get_builtin_tzdata
+
+i-cal-parser.xml 
+       icalparser_parse_value (No implementation)
+       
+i-cal-property.xml 
+       icalproperty_new_impl (Use icalproperty_new instead)
diff --git a/src/api/i-cal-property.xml b/src/api/i-cal-property.xml
index 2dfc25b..cb2a16d 100644
--- a/src/api/i-cal-property.xml
+++ b/src/api/i-cal-property.xml
@@ -129,10 +129,17 @@
         <comment xml:space="preserve">Get the string representation of the value in #ICalProperty.</comment>
     </method>
     <method name="i_cal_value_set_parent" corresponds="icalvalue_set_parent" since="2.0">
+<<<<<<< HEAD
        <parameter type="ICalValue *" name="value" comment="A #ICalValue"/>
        <parameter type="ICalProperty *" name="property" comment="A #ICalProperty"/>
        <comment xml:space="preserve">Set the parent of #ICalValue to be #ICalProperty.</comment>
     </method>
+=======
+       <parameter type="ICalValue *" name="value" comment="The child #ICalValue"/>
+       <parameter type="ICalProperty *" name="property" comment="The parent #ICalProperty"/>
+       <comment xml:space="preserve">Set the parent property of a value.</comment>
+       </method>
+>>>>>>> 81a4815... Update i-cal-property.xml
     <method name="i_cal_property_set_x_name" corresponds="icalproperty_set_x_name" since="1.0">
         <parameter type="ICalProperty *" name="prop" comment="A #ICalProperty"/>
         <parameter type="const gchar *" name="name" comment="The name string."/>