<<<<<<< HEAD
# Logs
logs
*.log
npm-debug.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules
jspm_packages

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# temp directory
tmp
=======
.DS_Store
node_modules/
dist/
yarn-debug.log*
yarn-error.log*

# Config folder
config/config.json
# Editor directories and files
.idea
*.suo
*.ntvs*
*.njsproj
*.sln
>>>>>>> frontend
frontend/dist1/
rendering/global
rendering/global/5c2f8896a2b7169d4e253944f3b733e2.png
rendering/global/81df1ac4d303319a79db19f45c5c475c.png
rendering/global/d24b3e361c4fc6263e0276f52ada9694.png
rendering/marketplacecontent
rendering/usercontent
nodeinfo.json

.env

usercontent
