From af329f0705a2880b96b783c6bae359138e326181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20MARQUET?=
 <72651575+BreizhHardware@users.noreply.github.com>
Date: Wed, 14 Jan 2026 09:26:39 +0100
Subject: [PATCH] Obisidian vault auto-backup: 14-01-2026 09:26:39 on . 1 files
 edited

---
 ISEN/Cloud Computing/CIPA4/Cloud Computing Cours 3.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ISEN/Cloud Computing/CIPA4/Cloud Computing Cours 3.md b/ISEN/Cloud Computing/CIPA4/Cloud Computing Cours 3.md
index c88a050..952acb0 100644
--- a/ISEN/Cloud Computing/CIPA4/Cloud Computing Cours 3.md	
+++ b/ISEN/Cloud Computing/CIPA4/Cloud Computing Cours 3.md	
@@ -14,3 +14,9 @@
 ## ff-merge
 ![](https://cdn.breizhhardware.fr/FAKA3/fOwOhUJo22.png/raw)
 
+## 3-way-merge
+![](https://cdn.breizhhardware.fr/FAKA3/BodibOPO89.png/raw)
+
+## Merge conflict
+![](https://cdn.breizhhardware.fr/FAKA3/CUgimImu48.png/raw)
+