From 6839a6bed779541b2b2cd3a9ac8b4effcf1e6a4c Mon Sep 17 00:00:00 2001
From: diptesh224 <narendradiptesh@gmail.com>
Date: Sun, 1 Sep 2024 17:16:28 +0530
Subject: [PATCH] patient dischharge

---
 Government of NCT of Delhi/templates/Patient_discharge.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Government of NCT of Delhi/templates/Patient_discharge.html b/Government of NCT of Delhi/templates/Patient_discharge.html
index 958b2a4..cfef407 100644
--- a/Government of NCT of Delhi/templates/Patient_discharge.html	
+++ b/Government of NCT of Delhi/templates/Patient_discharge.html	
@@ -105,7 +105,7 @@ <h2>Hospital Discharge Details Form</h2>
       <textarea id="diagnosis" name="diagnosis" rows="4" required></textarea>
 
       <label for="treatment">Treatment Provided:</label>
-<<<<<<< HEAD
+<!-- <<<<<<< HEAD
       <textarea
         id="treatment"
         name="treatment"
@@ -116,7 +116,7 @@ <h2>Hospital Discharge Details Form</h2>
 =======
       <textarea id="treatment" name="treatment" rows="4" required></textarea>
 
->>>>>>> 7486dcecdfbd47ef0b8006d549e33176c1a0b934
+>>>>>>> 7486dcecdfbd47ef0b8006d549e33176c1a0b934 -->
       <label for="doctor_name">Doctor's Name:</label>
       <input type="text" id="doctor_name" name="doctor_name" required />