Gallardo7761/etsii-vault
1
0
Fork 0
Code Issues Activity

cambios: 2024-12-01 17:12:22

Browse Source
This commit is contained in:
Jose
2024-12-01 17:12:22 +01:00
parent 78928e68ea ba7710a1ce
commit 7730137058
18 changed files with 185 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
conflict-files-obsidian-git.md Normal file
View File

@@ -0,0 +1,47 @@
# 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
- Not a file: Pasted image 20241125141142.png
- Not a file: Pasted image 20241125141145.png
- Not a file: Pasted image 20241125143529.png
- Not a file: Pasted image 20241125144533.png
- Not a file: Pasted image 20241125144536.png
- Not a file: Pasted image 20241125145409.png
- Not a file: Pasted image 20241125145411.png
- Not a file: Pasted image 20241125145413.png
- Not a file: Pasted image 20241125145439.png
- Not a file: Pasted image 20241125145544.png
- [[TERCERO/ATR1/images/Pasted image 20241125141142.png]]
- [[TERCERO/ATR1/images/Pasted image 20241125141145.png]]
- [[TERCERO/ATR1/images/Pasted image 20241125143529.png]]
- [[TERCERO/ATR1/images/Pasted image 20241125144533.png]]
- [[TERCERO/ATR1/images/Pasted image 20241125144536.png]]
- [[TERCERO/ATR1/images/Pasted image 20241125145409.png]]
- [[TERCERO/ATR1/images/Pasted image 20241125145411.png]]
- [[TERCERO/ATR1/images/Pasted image 20241125145413.png]]
- [[TERCERO/ATR1/images/Pasted image 20241125145439.png]]
- [[TERCERO/ATR1/images/Pasted image 20241125145544.png]]
- [[TERCERO/SS/images/Pasted image 20241125141142.png]]
- [[TERCERO/SS/images/Pasted image 20241125141145.png]]
- [[TERCERO/SS/images/Pasted image 20241125143529.png]]
- [[TERCERO/SS/images/Pasted image 20241125144533.png]]
- [[TERCERO/SS/images/Pasted image 20241125144536.png]]
- [[TERCERO/SS/images/Pasted image 20241125145409.png]]
- [[TERCERO/SS/images/Pasted image 20241125145411.png]]
- [[TERCERO/SS/images/Pasted image 20241125145413.png]]
- [[TERCERO/SS/images/Pasted image 20241125145439.png]]
- [[TERCERO/SS/images/Pasted image 20241125145544.png]]
# 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
```