[libical-glib] Fix conflict in i-cal-property.xml

[Miao Yu <williamyu src gnome org>]

commit f0cb36604bc40117278202c03ec78196852a769d
Author: William Yu <williamyu gnome org>
Date:   Sun Apr 3 15:24:33 2016 -0700

    Fix conflict in i-cal-property.xml

 src/api/i-cal-property.xml |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/src/api/i-cal-property.xml b/src/api/i-cal-property.xml
index cb2a16d..ecdfe19 100644
--- a/src/api/i-cal-property.xml
+++ b/src/api/i-cal-property.xml
@@ -129,17 +129,10 @@
         <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."/>