fjjgpt/src/App.vue

<template>
<<<<<<< HEAD
  <!-- <img alt="Vue logo" src="./assets/logo.png"> -->
  <HelloWorld msg="Welcome to Your Vue.js App"/>
</template>


<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',
  components: {
    HelloWorld
  }
}
</script>

<style>
#app {
  font-family: Avenir, Helvetica, Arial, sans-serif;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
  text-align: center;
  color: #2c3e50;
<<<<<<< HEAD
  margin-top: 0px;
=======
  margin-top: 60px;
>>>>>>> 0566a0e703f9d3a722fc62cd963287b9fb4807fa
}
</style>