hello

shalika10 · Jan 31, 2016 · 8453f64 · 8453f64
2 parents b196cb3 + dbf3820
commit 8453f64
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-letsee.txt
+exe.txt
+task
diff --git a/hello5.txt → letsee.txt b/hello5.txt → letsee.txt
diff --git a/practise.txt b/practise.txt
@@ -1 +1,5 @@
+<<<<<<< HEAD
 lets see complete newwwwww 
+=======
+pushing bth side i am changing file
+>>>>>>> dbf38205d0ebc4d682f742d2917631dc63206e11