diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 84aacd6..ae16e3e 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -20,8 +20,23 @@ "icon": "lucide-file", "title": "README" } + }, + { + "id": "6bdcf74dea1a2b7e", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "conflict-files-obsidian-git.md", + "mode": "source", + "source": false + }, + "icon": "lucide-file", + "title": "conflict-files-obsidian-git" + } } - ] + ], + "currentTab": 1 } ], "direction": "vertical" @@ -94,7 +109,7 @@ "state": { "type": "backlink", "state": { - "file": "README.md", + "file": "conflict-files-obsidian-git.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -104,7 +119,7 @@ "unlinkedCollapsed": true }, "icon": "links-coming-in", - "title": "Backlinks for README" + "title": "Backlinks for conflict-files-obsidian-git" } }, { @@ -113,12 +128,12 @@ "state": { "type": "outgoing-link", "state": { - "file": "README.md", + "file": "conflict-files-obsidian-git.md", "linksCollapsed": false, "unlinkedCollapsed": true }, "icon": "links-going-out", - "title": "Outgoing links from README" + "title": "Outgoing links from conflict-files-obsidian-git" } }, { @@ -156,13 +171,13 @@ "state": { "type": "outline", "state": { - "file": "README.md", + "file": "conflict-files-obsidian-git.md", "followCursor": false, "showSearch": false, "searchQuery": "" }, "icon": "lucide-list", - "title": "Outline of README" + "title": "Outline of conflict-files-obsidian-git" } }, { @@ -194,8 +209,10 @@ "obsidian-git:Open Git source control": false } }, - "active": "9b2e89c682f5d2ef", + "active": "6bdcf74dea1a2b7e", "lastOpenFiles": [ + "README.md", + "conflict-files-obsidian-git.md", "tools/_INDEX.md", "documentation/INDEX.md", "tools/security/pentest-recon-enum/Packet Capture & Analysis.md", @@ -203,7 +220,6 @@ "tools/security/pentest-recon-enum/Port Scanners & Network Discovery.md", "tools/security/Untitled.md", "tools/security/ssl-tls-web-security.md", - "README.md", "TOOL-TABLE-SCHEMA.md", "tools/sysadmin-devops/terminal-shell-productivity/Terminal Emulators.md", "tools/sysadmin-devops/terminal-shell-productivity/Files & Directories.md", @@ -222,7 +238,6 @@ "documentation/readme - to refactor.md", "documentation/manuals-howtos-guides/shell-tricks-functions.md", "documentation/other-cheat-sheets.md", - "documentation/manuals-howtos-guides/shell-one-liners.md", "documentation/manuals-howtos-guides", "documentation", "tools/security/hardening-compliance", diff --git a/README.md b/README.md index a6b5053..ae08cd2 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,6 @@ When ready: Plan to squash-merge or rebase + clean history into main. ## Fork Attribution & My Contributions **Forked on 2026-03-03** from [trimstray/the-book-of-secret-knowledge](https://github.com/trimstray/the-book-of-secret-knowledge) (MIT licensed, last major upstream activity ~2024). - -## Repository Structure Overview - -This is a living knowledge base of tools, techniques, one-liners, cheatsheets, and references — focused on security, networking, sysadmin, and devops. (LAST UPDATED 2026-03-07) - ## Repository Contents