From 3df3f05b4a619f6644bd3f2e963655afa415aa1a Mon Sep 17 00:00:00 2001
From: Ted Chang <student0804@gmail.com>
Date: Tue, 5 Dec 2023 00:24:49 +0800
Subject: [PATCH 1/3] modify enc.disk size as 20M

Signed-off-by: Ted Chang <student0804@gmail.com>
---
 _posts/2020-04-13-Disk-Encryption.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/_posts/2020-04-13-Disk-Encryption.md b/_posts/2020-04-13-Disk-Encryption.md
index a008c61..695e1df 100644
--- a/_posts/2020-04-13-Disk-Encryption.md
+++ b/_posts/2020-04-13-Disk-Encryption.md
@@ -177,8 +177,12 @@ provided as a password just in time (default) and or specified as key file
 managing LUKS volumes.<br>
 
 Let's setup a new LUKS volume with a simple passphrase as key protector:<br>
+<<<<<<< HEAD
 {:start="12"}<br>
 12. `dd if=/dev/zero of=enc.disk bs=1M count=10`<br>
+=======
+12. `dd if=/dev/zero of=enc.disk bs=1M count=20`<br>
+>>>>>>> ab6599a (modify enc.disk size as 20M)
 13. `dd if=/dev/urandom of=disk.key bs=1 count=32`<br>
 14. `loopdevice=$(losetup -f) && sudo losetup $loopdevice enc.disk`<br>
 15. `sudo cryptsetup luksFormat --key-file=disk.key $loopdevice`<br>

From 9a37bdc34b63e14bb3f04a33b9d4560daab552f1 Mon Sep 17 00:00:00 2001
From: Ted Chang <student0804@gmail.com>
Date: Tue, 21 Jul 2026 22:17:22 +0800
Subject: [PATCH 2/3] fix merge conflict

---
 _posts/2020-04-13-Disk-Encryption.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/_posts/2020-04-13-Disk-Encryption.md b/_posts/2020-04-13-Disk-Encryption.md
index 695e1df..ec6a23f 100644
--- a/_posts/2020-04-13-Disk-Encryption.md
+++ b/_posts/2020-04-13-Disk-Encryption.md
@@ -177,12 +177,7 @@ provided as a password just in time (default) and or specified as key file
 managing LUKS volumes.<br>
 
 Let's setup a new LUKS volume with a simple passphrase as key protector:<br>
-<<<<<<< HEAD
-{:start="12"}<br>
-12. `dd if=/dev/zero of=enc.disk bs=1M count=10`<br>
-=======
 12. `dd if=/dev/zero of=enc.disk bs=1M count=20`<br>
->>>>>>> ab6599a (modify enc.disk size as 20M)
 13. `dd if=/dev/urandom of=disk.key bs=1 count=32`<br>
 14. `loopdevice=$(losetup -f) && sudo losetup $loopdevice enc.disk`<br>
 15. `sudo cryptsetup luksFormat --key-file=disk.key $loopdevice`<br>

From c3278d2d24cd91597841af35035ea18c2a152b65 Mon Sep 17 00:00:00 2001
From: Ted Chang <student0804@gmail.com>
Date: Tue, 21 Jul 2026 22:19:53 +0800
Subject: [PATCH 3/3] fix

---
 _posts/2020-04-13-Disk-Encryption.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/_posts/2020-04-13-Disk-Encryption.md b/_posts/2020-04-13-Disk-Encryption.md
index ec6a23f..f14bf0e 100644
--- a/_posts/2020-04-13-Disk-Encryption.md
+++ b/_posts/2020-04-13-Disk-Encryption.md
@@ -177,6 +177,7 @@ provided as a password just in time (default) and or specified as key file
 managing LUKS volumes.<br>
 
 Let's setup a new LUKS volume with a simple passphrase as key protector:<br>
+{:start="12"}<br>
 12. `dd if=/dev/zero of=enc.disk bs=1M count=20`<br>
 13. `dd if=/dev/urandom of=disk.key bs=1 count=32`<br>
 14. `loopdevice=$(losetup -f) && sudo losetup $loopdevice enc.disk`<br>