More fixes due to dumb merge.

src/App.vue

@@ -1,6 +1,14 @@
 <template>
   <div id="app">
-    <img alt="Vue logo" src="./assets/logo.png" />
-    <h1>Welcome to Your Vue.js App</h1>
+    <NoteList />
   </div>
 </template>
+
+<script>
+import NoteList from '@/components/NoteList.vue'
+export default {
+  components: {
+    NoteList
+  }
+}
+</script>