mirror of
https://github.com/BreizhHardware/cours-ISEN-MD.git
synced 2026-03-18 21:50:46 +01:00
modified: .obsidian/workspace.json
new file: ISEN/Daily/06-12-2024.md new file: conflict-files-obsidian-git.md
This commit is contained in:
70
.obsidian/workspace.json
vendored
70
.obsidian/workspace.json
vendored
@@ -51,9 +51,39 @@
|
||||
"icon": "lucide-file",
|
||||
"title": "Fiche de révision DS1"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "42581ab3fc27c7bc",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "markdown",
|
||||
"state": {
|
||||
"file": "ISEN/Daily/06-12-2024.md",
|
||||
"mode": "source",
|
||||
"backlinks": true,
|
||||
"source": false
|
||||
},
|
||||
"icon": "lucide-file",
|
||||
"title": "06-12-2024"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "f9e8a0606fa55e4f",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "markdown",
|
||||
"state": {
|
||||
"file": "ISEN/Daily/06-12-2024.md",
|
||||
"mode": "source",
|
||||
"backlinks": true,
|
||||
"source": false
|
||||
},
|
||||
"icon": "lucide-file",
|
||||
"title": "06-12-2024"
|
||||
}
|
||||
}
|
||||
],
|
||||
"currentTab": 2
|
||||
"currentTab": 4
|
||||
}
|
||||
],
|
||||
"direction": "vertical"
|
||||
@@ -75,7 +105,7 @@
|
||||
"sortOrder": "alphabetical"
|
||||
},
|
||||
"icon": "lucide-folder-closed",
|
||||
"title": "Files"
|
||||
"title": "Explorateur de fichiers"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -102,7 +132,7 @@
|
||||
"type": "bookmarks",
|
||||
"state": {},
|
||||
"icon": "lucide-bookmark",
|
||||
"title": "Bookmarks"
|
||||
"title": "Signet"
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -171,10 +201,10 @@
|
||||
"state": {
|
||||
"type": "outline",
|
||||
"state": {
|
||||
"file": "ISEN/Maths/CIPA3/Fiche de révision DS1.md"
|
||||
"file": "ISEN/Daily/06-12-2024.md"
|
||||
},
|
||||
"icon": "lucide-list",
|
||||
"title": "Outline of Fiche de révision DS1"
|
||||
"title": "Plan de 06-12-2024"
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -210,20 +240,26 @@
|
||||
},
|
||||
"left-ribbon": {
|
||||
"hiddenItems": {
|
||||
"switcher:Open quick switcher": false,
|
||||
"graph:Open graph view": false,
|
||||
"canvas:Create new canvas": false,
|
||||
"daily-notes:Open today's daily note": false,
|
||||
"templates:Insert template": false,
|
||||
"command-palette:Open command palette": false,
|
||||
"audio-recorder:Start/stop recording": false,
|
||||
"switcher:Ouvrir le sélecteur rapide": false,
|
||||
"graph:Ouvrir la vue graphique": false,
|
||||
"canvas:Créer une nouvelle toile": false,
|
||||
"daily-notes:Ouvrir la note quotidienne": false,
|
||||
"templates:Insérer le modèle": false,
|
||||
"command-palette:Ouvrir la palette de commandes": false,
|
||||
"audio-recorder:Démarrer / arrêter l'enregistrement": false,
|
||||
"obsidian-git:Open Git source control": false
|
||||
}
|
||||
},
|
||||
"active": "4794ff7216968ed7",
|
||||
"active": "cc56184c227b09ca",
|
||||
"lastOpenFiles": [
|
||||
"ISEN/Daily/03-12-2024.md",
|
||||
"conflict-files-obsidian-git.md",
|
||||
"ISEN/Daily/06-12-2024.md",
|
||||
"ISEN/English/CIPA3/Company presentation.md",
|
||||
"ISEN/Maths/CIPA3/Fiche de révision DS1.md",
|
||||
"ISEN/Daily/05-12-2024.md",
|
||||
"ISEN/FHS/A2/Outils RH/~WRL2137.tmp",
|
||||
"ISEN/FHS/A2/Outils RH/~$ttre de motivation.docx",
|
||||
"ISEN/Daily/03-12-2024.md",
|
||||
"ISEN/Maths/CIPA3/Fiche de révision DS1.pdf",
|
||||
"ISEN/Daily/02-12-2024.md",
|
||||
"ISEN/FHS/CIPA3/Gestion de projet/Gestion de projet Cours 2.md",
|
||||
@@ -234,7 +270,6 @@
|
||||
"ISEN/Daily/30/11/2024.md",
|
||||
"ISEN/Daily/30/11",
|
||||
"ISEN/Daily/30",
|
||||
"ISEN/English/CIPA3/Company presentation.md",
|
||||
"ISEN/English/CIPA3/29 nov 2024.md",
|
||||
"ISEN/English/CIPA3/17 sept 2024.md",
|
||||
"ISEN/FHS/CIPA3/Gestion de projet/Gestion de projet Cours 3.md",
|
||||
@@ -252,15 +287,10 @@
|
||||
"Gestion.md",
|
||||
"README.md",
|
||||
"ISEN/FHS/CIPA3/Gestion de projet/Réunion projet entreprenariat.md",
|
||||
"ISEN/Réseau/A2/CCNA Cours 5.md",
|
||||
"ISEN/Réseau/A2/CCNA Cours 4.md",
|
||||
"ISEN/Réseau/A2/CCNA Cours 1.md",
|
||||
"Recording 20241106150303.webm",
|
||||
"Pasted image 20240505210657.png",
|
||||
"Pasted image 20240505210642.png",
|
||||
"ISEN/FHS/CIPA3/Gestion de projet",
|
||||
"ISEN/Algo C/CIPA3/makefile example.c",
|
||||
"ISEN/Algo C/CIPA3/TP2_C.pdf",
|
||||
"ISEN/Modelec/NB point.canvas",
|
||||
"ISEN/Réseau/A2/TP Ansible et docker.canvas",
|
||||
"Untitled.canvas",
|
||||
|
||||
7
ISEN/Daily/06-12-2024.md
Normal file
7
ISEN/Daily/06-12-2024.md
Normal file
@@ -0,0 +1,7 @@
|
||||
#Daily
|
||||
Cours du 2024-12-06
|
||||
|
||||
|
||||
|
||||
---
|
||||
© Félix MARQUET
|
||||
17
conflict-files-obsidian-git.md
Normal file
17
conflict-files-obsidian-git.md
Normal file
@@ -0,0 +1,17 @@
|
||||
# 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
|
||||
|
||||
- [[Fiche de révision DS1.pdf]]
|
||||
|
||||
# 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
|
||||
```
|
||||
Reference in New Issue
Block a user