diff --git a/153070031/README.txt b/153070031/README.txt index a5c67ec..cdbccff 100644 --- a/153070031/README.txt +++ b/153070031/README.txt @@ -1,13 +1,14 @@ -Name: Student T -Course: MBBS +Name: Varun Warrier -Department: Medical Sciences +Course: M Tech -Roll number: M1234 +Department: Electrical Engineering -Year: 2020 +Roll number: 153079031 + +Year: 2016 Research/study interests: -Brain surgery, heart disease, foot in mouth disease. \ No newline at end of file +Embedded Systems, Digital Signal Processing, Analog Circuits diff --git a/153079031/README.txt b/153079031/README.txt index a5c67ec..21d778c 100644 --- a/153079031/README.txt +++ b/153079031/README.txt @@ -1,3 +1,18 @@ +<<<<<<< HEAD +Name: Varun Warrier + +Course: M Tech + +Department: Electrical Engineering + +Roll number: 153079031 + +Year: 2016 + +Research/study interests: + +Embedded Systems, Digital Signal Processing, Analog Circuits +======= Name: Student T Course: MBBS @@ -10,4 +25,5 @@ Year: 2020 Research/study interests: -Brain surgery, heart disease, foot in mouth disease. \ No newline at end of file +Brain surgery, heart disease, foot in mouth disease. +>>>>>>> 799dc30f2a8c2131fbdd7b2bb2b30b0fae056c21