Merge branch 'main' of https://github.com/hjianglong/fjjgpt

src/App.vue

@@ -1,4 +1,5 @@
 <template>
+<<<<<<< HEAD
   <!-- <img alt="Vue logo" src="./assets/logo.png"> -->
   <HelloWorld msg="Welcome to Your Vue.js App"/>
 </template>
@@ -7,6 +8,14 @@
 <script>
 // import HelloWorld from './components/HelloWorld.vue'
 import HelloWorld from './views/AdminPage.vue'
+=======
+  <img alt="Vue logo" src="./assets/logo.png">
+  <HelloWorld msg="Welcome to Your Vue.js App"/>
+</template>
+
+<script>
+import HelloWorld from './components/HelloWorld.vue'
+>>>>>>> 0566a0e703f9d3a722fc62cd963287b9fb4807fa
 
 export default {
   name: 'App',
@@ -23,6 +32,10 @@ export default {
   -moz-osx-font-smoothing: grayscale;
   text-align: center;
   color: #2c3e50;
+<<<<<<< HEAD
   margin-top: 0px;
+=======
+  margin-top: 60px;
+>>>>>>> 0566a0e703f9d3a722fc62cd963287b9fb4807fa
 }
 </style>