.npmignore

@@ -1,6 +1,7 @@
 .build.yarnrc.yml
 .drone.yml
 .eslintrc*
+.npmrc
 .prettierrc*
 .yarnrc.yml
 babel.config.*

src/dao/auth/readOneByRecord.ts

@@ -1,5 +1,9 @@
 import { Types } from 'mongoose';
 
+<<<<<<<< HEAD:src/dao/auth/readOneByRecord.ts
 import { Auth } from '../../model/auth';
+========
+import { Auth } from '../model/auth';
+>>>>>>>> main:src/dao/readOneByRecord.ts
 
 export const readOneByRecord = async (record: Types.ObjectId) => Auth.findOne({ record });

src/dao/auth/readOneByUsername.ts

@@ -1,3 +1,7 @@
+<<<<<<<< HEAD:src/dao/auth/readOneByUsername.ts
 import { Auth } from '../../model/auth';
+========
+import { Auth } from '../model/auth';
+>>>>>>>> main:src/dao/readOneByUsername.ts
 
 export const readOneByUsername = async (username: string) => Auth.findOne({ username });