From e305d7e907dc4932122a98b6af8313bc68977e17 Mon Sep 17 00:00:00 2001
From: Tanyalak <tanyalak@frappet.com>
Date: Fri, 15 Dec 2023 10:56:57 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/00_contact/views/Main.vue | 29 +++++++--------------------
 src/views/MainLayout.vue              | 16 ++-------------
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/src/modules/00_contact/views/Main.vue b/src/modules/00_contact/views/Main.vue
index 6545f3f..bff05d7 100644
--- a/src/modules/00_contact/views/Main.vue
+++ b/src/modules/00_contact/views/Main.vue
@@ -1,31 +1,16 @@
 <script setup lang="ts">
 </script>
 <template>
-<<<<<<< HEAD
     <div class="col-12 row justify-center text-h6 text-dark q-pt-md">ติดต่อเรา</div>
 	<div class="col-12"><q-separator color="grey-4" /></div>
-=======
 
-<div class="col-xs-10 col-md-8 row q-col-gutter-md">
-    <div class="col-12 row justify-center text-h6 text-dark">ระบบทรัพยากรบุคคล</div>
-                        <div class="col-12">
-                        <q-separator color="grey-4" /></div>
-						<div class="col-12">
-							<div class="col-12 row q-col-gutter-lg">
-							</div>
-						</div>
-					</div>
-
-    <div class="q-px-md q-py-sm text-subtitle1 text-dark bg-grey-4 text-weight-medium">
-        ระบบหลัก
-    </div>
-    
->>>>>>> aom_dev
-
-
-    
-
-    
+    <q-card class="row col-12 q-mt-md">
+        <div class="col-12 q-px-md q-py-sm text-subtitle1 text-dark bg-grey-4 text-weight-medium">
+            ระบบหลัก
+        </div>
+        <div class="col-12 row q-pa-md">
+        </div>
+    </q-card>  
 </template>
 
 <style>
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index c629620..714d554 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -79,15 +79,9 @@ const onScroll = (info: any) => { scrollInfo.value = info}
 					<img src="@/assets/logo.png" style="height: 35px; max-width: 35px" />
 				</div>
 				<q-space></q-space>
-<<<<<<< HEAD
 				<div class="row q-col-gutter-x-sm">
-					<div><q-btn flat color="white" label="หน้าแรก" @click="goHome"/></div>
-					<div><q-btn color="primary" label="ติดต่อเรา" @click="click()"/></div>
-=======
-				<div>
-					<q-btn class="text-weight-medium" flat color="white" label="หน้าแรก" @click="goHome"/>
-					<q-btn color="secondary" text-color="white" label="ติดต่อเรา" @click="click()"/>
->>>>>>> aom_dev
+					<div><q-btn class="text-weight-medium" flat color="white" label="หน้าแรก" @click="goHome"/></div>
+					<div><q-btn color="secondary" text-color="white" label="ติดต่อเรา" @click="click()"/></div>
 				</div>
 			</q-toolbar>
 		</q-header>
@@ -106,15 +100,9 @@ const onScroll = (info: any) => { scrollInfo.value = info}
 							</template>
 						</q-input>
 					</div>
-<<<<<<< HEAD
 					<div class="col-xs-10 col-md-8 row q-col-gutter-md" style=" margin-top: 80px;" v-if="currentRoute == 'home'">
 						<div class="col-12 row justify-center text-h6 text-dark">ระบบทรัพยากรบุคคล</div>
 						<div class="col-12"><q-separator color="grey-4" /></div>
-=======
-					<div class="col-xs-10 col-md-8 row q-col-gutter-md" style=" margin-top: 80px;" v-if="currentRouteName == ''">
-<div class="col-12 row justify-center text-h6 text-dark">ระบบทรัพยากรบุคคล</div>
-                        <div class="col-12"><q-separator color="grey-4" /></div>
->>>>>>> aom_dev
 						<div class="col-12">
 							<div class="col-12 row q-col-gutter-lg">