Schulisches/TI-Studium-Mitschriften
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vault backup: 2025-07-02 14:34:34

Browse Source
This commit is contained in:
fzzinchemical
2025-07-02 14:34:34 +02:00
parent 269b8a31ba
commit c0ae83595f
72 changed files with 208723 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
conflict-files-obsidian-git.md
View File

@@ -1,17 +0,0 @@
# Conflicts
Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
(This file will automatically be deleted before commit)
[[#Additional Instructions]] available below file list
- Not a file: .obsidian/workspace.json
# Additional Instructions
I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
```diff
<<<<<<< HEAD
File changes in local repository
=======
File changes in remote repository
>>>>>>> origin/main
```