From 8cec3b96128e6283fd3ba926d92c8dcb8508258a Mon Sep 17 00:00:00 2001
From: Harish Murali <Harish Murali>
Date: Sat, 24 Sep 2016 15:42:31 +0530
Subject: [PATCH 1/2] Assignment 1

Commmit 1 for SDES assignment. Added Readme file containing student info.
---
 140010046/README.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 140010046/README.txt

diff --git a/140010046/README.txt b/140010046/README.txt
new file mode 100644
index 0000000..7eafecc
--- /dev/null
+++ b/140010046/README.txt
@@ -0,0 +1,13 @@
+Name: M Harish
+
+Course: B.Tech
+
+Department: Aerospace Engineering
+
+Roll number: 140010046
+
+Year: Third
+
+Research/study interests:
+
+Turbulence, Linear analysis, CFD
\ No newline at end of file

From 6a34ab4d5a75e0f2ee674189136e9d22d78f6966 Mon Sep 17 00:00:00 2001
From: Harish Murali <Harish Murali>
Date: Tue, 27 Sep 2016 10:35:31 +0530
Subject: [PATCH 2/2] Commit 2.1: Making changes in new_branch to obtain merge
 conflicts

---
 140010020/README.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/140010020/README.txt b/140010020/README.txt
index a5c67ec..ca10df3 100644
--- a/140010020/README.txt
+++ b/140010020/README.txt
@@ -1,13 +1,13 @@
-Name: Student T
+Name: M Harish 
 
-Course: MBBS
+Course: B Tech
 
-Department: Medical Sciences
+Department: Aerospace Engineering
 
-Roll number: M1234
+Roll number: 140010046
 
-Year: 2020
+Year: 2014
 
 Research/study interests:
 
-Brain surgery, heart disease, foot in mouth disease.
\ No newline at end of file
+Turbulence, CFD, Parallel Computing
\ No newline at end of file