SHA1
--- a/file1.txt
+++ b/file1.txt
@@ -1 +1,2 @@
 
				+hgvbyhnhkjmki
			
 
				 hello world
			
--- a/tessst.py
+++ b/tessst.py
@@ -0,0 +1,3 @@
 
				+a = '2'
			
 
				+b = '3'
			
 
				+print(a + b)
Author	SHA1 Message	Date
piccolo-gatto	71f7c0fa5e fix conflict in file1.txt	1 year ago
piccolo-gatto	8e8ee9ff45 create tessst.py, update file1.txt	1 year ago