This website works better with JavaScript
Home
Explore
Sign In
piccolo-gatto
/
GIT_practice
Watch
1
Star
0
Fork
0
Files
Issues
0
Pull Requests
0
Wiki
Browse Source
fix conflict in file1.txt
piccolo-gatto
1 year ago
parent
8e8ee9ff45
c1efa76039
commit
71f7c0fa5e
2 changed files
with
4 additions
and
0 deletions
Split View
Show Diff Stats
1
0
file1.txt
3
0
test.py
+ 1
- 0
file1.txt
View File
@@ -1 +1,2 @@
hgvbyhnhkjmki
+hello world
+ 3
- 0
test.py
View File
@@ -0,0 +1,3 @@
+a = 2
+b = 3
+print(a + b)