HOUYT
7 gadi atpakaļ
vecāks
revīzija
68dcd84277
1 mainītis faili ar
6 papildinājumiem un
3 dzēšanām
-
6
3
daima.txt
|
|
@@ -1,8 +1,11 @@
|
|
|
-<<<<<<< .mine
|
|
|
+
|
|
|
vbsjdkbvjk sb jk1
|
|
|
=======
|
|
|
=======
|
|
|
jhhf jkhh kng
|
|
|
->>>>>>> .theirshbmn
|
|
|
+
|
|
|
+=======
|
|
|
+.theirshbmn
|
|
|
dghf sdjk kVNKvnskdn
|
|
|
- gjksdjkm
|
|
|
+ gjksdjkm
|
|
|
+
|
