190 build попытка 2
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -125,7 +125,6 @@ $RECYCLE.BIN/
|
||||
# Keep README.md and the permanent project documentation tracked.
|
||||
BUILD[0-9]*.md
|
||||
UPDATE_NO_USER_CONFIG.txt
|
||||
<<<<<<< HEAD
|
||||
|
||||
# Rotated logs and historical update packaging
|
||||
*.log.*
|
||||
@@ -144,5 +143,3 @@ agent/agent_config.json
|
||||
|
||||
# Historical documentation is intentionally bundled, without runtime data.
|
||||
!docs/history.zip
|
||||
=======
|
||||
>>>>>>> e4bedb1264fca8a6bc8a41f0ca1ff67b176c6651
|
||||
|
||||
Reference in New Issue
Block a user