From 48e969cb6a6d8abb324189f836586aea088a685c Mon Sep 17 00:00:00 2001
From: callmeroot <anoushka.jha.che21@itbhu.ac.in>
Date: Tue, 16 Jul 2024 23:14:05 +0530
Subject: [PATCH] fixed conflicts

---
 docs/pages/playground.vue | 5 ++---
 lib/KTable/index.vue      | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/pages/playground.vue b/docs/pages/playground.vue
index c2c5e0219..40e588f64 100644
--- a/docs/pages/playground.vue
+++ b/docs/pages/playground.vue
@@ -139,8 +139,8 @@
 
           setTimeout(() => {
             this.updateLoadingMessage('');
-          }, 3000);
-        }, 2000); // Simulate a 2 second delay for fetching data
+          }, 5000);
+        }, 10000); // Simulate a 10 second delay for fetching data
       },
     },
   };
@@ -184,6 +184,5 @@ h1, h2 {
   clip: rect(0, 0, 0, 0);
   white-space: nowrap;
   border-width: 0;
-  visibility: hidden;
 }
 </style>
\ No newline at end of file
diff --git a/lib/KTable/index.vue b/lib/KTable/index.vue
index fac04759a..6e708e6fd 100644
--- a/lib/KTable/index.vue
+++ b/lib/KTable/index.vue
@@ -23,8 +23,8 @@
               {{ header.label }}
             </slot>
             <span v-if="sortable && header.dataType !== DATA_TYPE_OTHERS" class="sort-icon">
-              <span v-if="sortKey === index && sortOrder === SORT_ORDER_ASC">⬆️</span>
-              <span v-else-if="sortKey === index && sortOrder === SORT_ORDER_DESC">⬇️</span>
+              <span v-if="sortKey === index && sortOrder === SORT_ORDER_ASC"><KIcon icon="dropup" /></span>
+              <span v-else-if="sortKey === index && sortOrder === SORT_ORDER_DESC"><KIcon icon="dropdown" /></span>
               <span v-else>⬍</span>
             </span>
           </th>