From 512b9fbf4aa9eecdf55a8be7d793ff0026aada3e Mon Sep 17 00:00:00 2001
From: Juan Linietsky <reduzio@gmail.com>
Date: Tue, 12 Sep 2017 10:51:24 -0300
Subject: Fixed conflict in len() function

---
 doc/base/classes.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index a8e877ccd5..100ecc8329 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -494,11 +494,7 @@
 			<argument index="0" name="var" type="Variant">
 			</argument>
 			<description>
-<<<<<<< HEAD
 				Returns length of Variant 'var'. Length is the character count of String, element count of Array, size of Dictionary, etc. Note: Generates a fatal error if Variant can not provide a length.
-=======
-				Returns length of Variant 'var'. Length is the element count of an Array, size of a Dictionary, etc. Note: Generates a fatal error if Variant can not provide a length.
->>>>>>> 75b92e809dc95aefd3afab5a9efbd582a1a8d953
 				[codeblock]
 				a = [1, 2, 3, 4]
 				print(len(a))
-- 
cgit v1.2.3