From 942b0cb27ea7f0dddbefbbfa78fddb5b53cf28d7 Mon Sep 17 00:00:00 2001
From: Diya-1410 <diiyyaa1405@gmail.com>
Date: Mon, 19 May 2025 10:06:49 +0530
Subject: [PATCH 1/2] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e389399..85a3cbf 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,2 @@
-# OPS_final_Practical
\ No newline at end of file
+# OPS_final_Practical
+MERGING CONFLICT - ABCD

From 86b3079e014f4b54de117b340ada2c1e27eed6fb Mon Sep 17 00:00:00 2001
From: Diya-1410 <diiyyaa1405@gmail.com>
Date: Mon, 19 May 2025 10:18:09 +0530
Subject: [PATCH 2/2] Update add.c

---
 add.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/add.c b/add.c
index 9eb5c45..2b196ad 100644
--- a/add.c
+++ b/add.c
@@ -6,5 +6,6 @@ Int a=10, b=10, c;
 clrscr();
 c=a+b;
 printf("C=%d", c)
+  scanf(&d)
 getch();
 }