<<<<<<< HEAD .DS_Store node_modules/ unpackage/ dist/ babel.config.js postcss.config.js package-lock.json tsconfig.json yarn.lock public/ package-lock.json # local env files .env.local .env.*.local # Log files npm-debug.log* yarn-debug.log* yarn-error.log* # Editor directories and files .project .idea .vscode *.suo *.ntvs* *.njsproj *.sln *.sw* ======= # Numerous always-ignore extensions *.bak *.patch *.diff *.err # temp file for git conflict merging *.orig *.log *.rej *.swo *.swp *.zip *.vi *~ *.sass-cache *.tmp.html *.dump # OS or Editor folders .DS_Store ._* .cache .project .settings .tmproj *.esproj *.sublime-project *.sublime-workspace nbproject thumbs.db *.iml # Folders to ignore .hg .svn .CVS .idea node_modules/ jscoverage_lib/ bower_components/ dist/ >>>>>>> e0e3e31d938af30f2d8c84c06b4f715773fb507b