.

@@ -27,7 +27,6 @@ function makeFolder(folderData) {
     return axios.post('/api/folder/makefolder', folderData);
     return axios.post('/api/folder/makefolder', folderData);
 }
 }
 
 
-<<<<<<< HEAD
 function file(userData){
 function file(userData){
     return axios.get('/api/file', userData, {
     return axios.get('/api/file', userData, {
         params: {
         params: {
@@ -45,6 +44,3 @@ function dropbox(userData){
 }
 }
 
 
 //  export { registerUser, loginUser, dropbox, makeFolder };
 //  export { registerUser, loginUser, dropbox, makeFolder };
-=======
-export { registerUser, loginUser, folder, makeFolder };
->>>>>>> ec5658f978ed2a5a94bba39bcb9aecf9edc70c36

@@ -107,11 +107,7 @@
         <v-container>
         <v-container>
           <div>
           <div>
             <v-icon>mdi-folder</v-icon>
             <v-icon>mdi-folder</v-icon>
-<<<<<<< HEAD
             <v-text-field placeholder="name" id="foldername" type="text" v-model="foldername" ></v-text-field>
             <v-text-field placeholder="name" id="foldername" type="text" v-model="foldername" ></v-text-field>
-=======
-            <v-text-field placeholder="name" id="foldername" type="text" v-model="foldername"></v-text-field>
->>>>>>> ec5658f978ed2a5a94bba39bcb9aecf9edc70c36
           </div>
           </div>
         </v-container>
         </v-container>
         <v-card-actions>
         <v-card-actions>
@@ -149,17 +145,11 @@ import { folder, makeFolder } from '../api/index';
             id : this.$store.state.id,
             id : this.$store.state.id,
             cur: '/'
             cur: '/'
           }
           }
-<<<<<<< HEAD
-          const response = await dropbox(userData);
-          this.$store.commit('setFolder', response.data.folders);
-          this.$store.commit('setFile', response.data.files);
-=======
           const response = await folder(curData);
           const response = await folder(curData);
           console.log(response.data);
           console.log(response.data);
           this.$store.commit('setFolder', response.data.folders);
           this.$store.commit('setFolder', response.data.folders);
           this.$store.commit('setCur', response.data.cur);
           this.$store.commit('setCur', response.data.cur);
           this.$store.commit('setParent', response.data.parentPath);
           this.$store.commit('setParent', response.data.parentPath);
->>>>>>> ec5658f978ed2a5a94bba39bcb9aecf9edc70c36
         } catch (error) {
         } catch (error) {
           console.log("에러");
           console.log("에러");
           console.log(error.response.data);
           console.log(error.response.data);
@@ -187,11 +177,6 @@ import { folder, makeFolder } from '../api/index';
              this.initFolderName();
              this.initFolderName();
              this.dialog = false;
              this.dialog = false;
            }
            }
-<<<<<<< HEAD
-         }
-
-  }
-=======
          },
          },
          async moveF(move_folder_name){
          async moveF(move_folder_name){
            try {
            try {
@@ -210,6 +195,5 @@ import { folder, makeFolder } from '../api/index';
         }
         }
          }
          }
     }
     }
->>>>>>> ec5658f978ed2a5a94bba39bcb9aecf9edc70c36
   }
   }
 </script>
 </script>
\ No newline at end of file

@@ -67,14 +67,10 @@ export default new VueRouter ({
         name:'Feedback',
         name:'Feedback',
         component: () => import('../views/Feedback.vue')
         component: () => import('../views/Feedback.vue')
       },
       },
-<<<<<<< HEAD
       {
       {
         path: '/folder',
         path: '/folder',
         name: 'Folder',
         name: 'Folder',
         component: () => import('../views/FolderPage.vue')
         component: () => import('../views/FolderPage.vue')
       },
       },
-=======
-
->>>>>>> ec5658f978ed2a5a94bba39bcb9aecf9edc70c36
     ]
     ]
 })
 })

@@ -9,10 +9,7 @@ export default new Vuex.Store({
         folders: {},
         folders: {},
         files: {},
         files: {},
         cur: '/',
         cur: '/',
-<<<<<<< HEAD
-=======
         parent: '/'
         parent: '/'
->>>>>>> ec5658f978ed2a5a94bba39bcb9aecf9edc70c36
     },
     },
     mutations: {
     mutations: {
         setId(state, userid) {
         setId(state, userid) {
@@ -49,7 +46,6 @@ export default new Vuex.Store({
         },
         },
         cur(state) {
         cur(state) {
             return state.cur;
             return state.cur;
-<<<<<<< HEAD
         },        
         },        
         setFolder(state, folderlist){
         setFolder(state, folderlist){
           state.folders  = folderlist;
           state.folders  = folderlist;
@@ -58,11 +54,4 @@ export default new Vuex.Store({
           state.files = filelist;
           state.files = filelist;
         },
         },
   },
   },
-=======
-        },
-        parent(state) {
-            return state.parent;
-        }
-    }
->>>>>>> ec5658f978ed2a5a94bba39bcb9aecf9edc70c36
 })
 })
\ No newline at end of file