ALL the commits for the files

sampathIS · Jan 8, 2022 · 7d67a2d · 7d67a2d
2 parents 1a35c67 + 3ac1649
commit 7d67a2d
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 0 deletions.
diff --git a/.bash b/.bash
@@ -0,0 +1,4 @@
+git_branch() {
+  git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/'
+}
+export PS1="\e[1m\e[32m\u@\h\e[0m\e[0m:\e[1m\e[34m\w\e[0m\e[1;33m\$(git_branch)\e[0m\$ "
diff --git a/feature.py b/feature.py
@@ -0,0 +1 @@
+This is the start of the new feature asked by the boss
diff --git a/goodnight.py b/goodnight.py
@@ -0,0 +1,3 @@
+#print("Good Night")
+#print("Sweet dreams")
+#print("BYE")
diff --git a/greetings.py b/greetings.py
@@ -4,3 +4,5 @@
 #show some cool greeting image
 
 # Ask the user what he/she wants to drink
+
+# If you can dream it you can do it  
diff --git a/moonflight.py b/moonflight.py
@@ -0,0 +1 @@
+# This is moonflight
diff --git a/mynewtest.py b/mynewtest.py
@@ -0,0 +1,2 @@
+#This is a new code for my deployment
+
diff --git a/new_mars_message.py b/new_mars_message.py
@@ -0,0 +1 @@
+"this is sam from mars"
diff --git a/temp b/temp
@@ -1 +1,5 @@
+<<<<<<< HEAD
 th sis temp file
+=======
+
+>>>>>>> feature
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This is the start of the new feature asked by the boss
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,5 @@
		#show some cool greeting image

		# Ask the user what he/she wants to drink

		# If you can dream it you can do it