From 1088630b5bac992fbdfc23c33da612bd4fa5b6cb Mon Sep 17 00:00:00 2001
From: xile611 <dingling112@gmail.com>
Date: Fri, 28 Jun 2024 21:53:53 +0800
Subject: [PATCH] fix: fix conflicts with 1.11.6

---
 .../library/src/main/ets/vchart_dist.js       | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/packages/harmony_vchart/library/src/main/ets/vchart_dist.js b/packages/harmony_vchart/library/src/main/ets/vchart_dist.js
index b85ec5f2b3..75b66012a2 100644
--- a/packages/harmony_vchart/library/src/main/ets/vchart_dist.js
+++ b/packages/harmony_vchart/library/src/main/ets/vchart_dist.js
@@ -1,16 +1,16 @@
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+/*! *****************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
 function __rest$7(s, e) {
   var t = {};
@@ -66404,11 +66404,7 @@ const registerCanvasTooltipHandler = () => {
     registerComponentPlugin(CanvasTooltipHandler);
 };
 
-<<<<<<< HEAD
-const version = "1.11.3";
-=======
 const version = "1.11.6";
->>>>>>> origin/develop
 
 const addVChartProperty = (data, op) => {
     const context = op.beforeCall();