From 2f6f485e84cfbb3defa7e92a599cbd1702d8fbb0 Mon Sep 17 00:00:00 2001 From: sankasuraj Date: Wed, 24 Aug 2016 21:14:24 +0530 Subject: [PATCH 1/4] Add files via upload Committed README.txt file --- README.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 README.txt diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..f87c3fb --- /dev/null +++ b/README.txt @@ -0,0 +1,11 @@ +Name: Suraj Sanka + +Course: SDES + +Department: Aerospace Engineering + +Roll number: 130010057 + +Year: 2016 + +Research/study interests: Coding From b127653553b3b8848107a5f958f00baf29d7ff92 Mon Sep 17 00:00:00 2001 From: sankasuraj Date: Sat, 27 Aug 2016 21:50:21 +0530 Subject: [PATCH 2/4] Committed a new README.txt file within a folder --- 130010057/README.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 130010057/README.txt diff --git a/130010057/README.txt b/130010057/README.txt new file mode 100644 index 0000000..f87c3fb --- /dev/null +++ b/130010057/README.txt @@ -0,0 +1,11 @@ +Name: Suraj Sanka + +Course: SDES + +Department: Aerospace Engineering + +Roll number: 130010057 + +Year: 2016 + +Research/study interests: Coding From 5dfffc2528daae8ffc9c7fd5ee6bbbb15a608900 Mon Sep 17 00:00:00 2001 From: sankasuraj Date: Sat, 27 Aug 2016 21:53:57 +0530 Subject: [PATCH 3/4] Delete README.txt --- README.txt | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 README.txt diff --git a/README.txt b/README.txt deleted file mode 100644 index f87c3fb..0000000 --- a/README.txt +++ /dev/null @@ -1,11 +0,0 @@ -Name: Suraj Sanka - -Course: SDES - -Department: Aerospace Engineering - -Roll number: 130010057 - -Year: 2016 - -Research/study interests: Coding From 868e26256f0a51296ad2dff22b957e39556bfb88 Mon Sep 17 00:00:00 2001 From: sankasuraj Date: Mon, 26 Sep 2016 23:58:38 +0530 Subject: [PATCH 4/4] Resolved conflicts and commiting again --- 130010057/README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 130010057/README.md diff --git a/130010057/README.md b/130010057/README.md new file mode 100644 index 0000000..f87c3fb --- /dev/null +++ b/130010057/README.md @@ -0,0 +1,11 @@ +Name: Suraj Sanka + +Course: SDES + +Department: Aerospace Engineering + +Roll number: 130010057 + +Year: 2016 + +Research/study interests: Coding