From d33d71d13a23ea2aa518eb176d7791a68c261992 Mon Sep 17 00:00:00 2001
From: Roland Lannuzel <roland.lannuzel@4d.com>
Date: Tue, 30 Jul 2024 12:07:27 +0200
Subject: [PATCH] classes WPxxx updates

---
 Project/Sources/Classes/WPdocument.4dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Project/Sources/Classes/WPdocument.4dm b/Project/Sources/Classes/WPdocument.4dm
index 294f5c76..bb4b7cbf 100644
--- a/Project/Sources/Classes/WPdocument.4dm
+++ b/Project/Sources/Classes/WPdocument.4dm
@@ -190,13 +190,9 @@ Function getAttributes($attributeNames : Collection)->$attributes : Object  // c
 	End for each 
 	
 	
-<<<<<<< Updated upstream
-	//mark:-BODY
 	
-Function getBody()->$body : cs:C1710.WPelement
-=======
+	//mark:-BODY
 Function getBody()->$body : cs:C1710.WPelement  // ∆∆∆
->>>>>>> Stashed changes
 	$body:=cs:C1710.WPelement.new(WP Get body:C1516(This:C1470.document))