From efc2515ba99c8eab04de802bbc6407cdf7b52cdd Mon Sep 17 00:00:00 2001
From: Tarandeep <tarandeepjuneja11@gmail.com>
Date: Sat, 12 Oct 2024 11:42:25 +0530
Subject: [PATCH 1/2] Added a new haiku about the future of tech

---
 my_haiku.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 my_haiku.md

diff --git a/my_haiku.md b/my_haiku.md
new file mode 100644
index 000000000..e85866ea9
--- /dev/null
+++ b/my_haiku.md
@@ -0,0 +1,9 @@
+---
+layout: haiku
+title: Future of Tech
+author: Tarandeep
+---
+
+Machines speak in code<br>
+Bright data flows like rivers<br>
+Dreams born in the cloud<br>

From b67b05aa2087d929afe5bed8ea4024cdc96e8856 Mon Sep 17 00:00:00 2001
From: Tarandeep <tarandeepjuneja11@gmail.com>
Date: Sat, 12 Oct 2024 11:55:34 +0530
Subject: [PATCH 2/2] Resolved merge conflicts

---
 cloud_haiku | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 cloud_haiku

diff --git a/cloud_haiku b/cloud_haiku
new file mode 160000
index 000000000..efc2515ba
--- /dev/null
+++ b/cloud_haiku
@@ -0,0 +1 @@
+Subproject commit efc2515ba99c8eab04de802bbc6407cdf7b52cdd