mirror of
https://github.com/Dictionarry-Hub/profilarr.git
synced 2026-01-22 10:51:02 +01:00
ca84a1c95b
- pulls now correctly identify merge conflicts and enter a merge state - user resolves each file individually - commit resolve merge state - allows users to keep custom changes and pull in updates - improve commit message component - seperated commit / add functionality
15 lines
121 B
Plaintext
15 lines
121 B
Plaintext
# Node
|
|
node_modules/
|
|
dist/
|
|
|
|
# Python
|
|
__pycache__/
|
|
*.pyc
|
|
|
|
# Environment variables
|
|
.env
|
|
.env.1
|
|
.env.2
|
|
|
|
# OS files
|
|
.DS_Store |