kansalmitul · kansalmitul · Jan 15, 2026 · Jan 16, 2026 · Jan 18, 2026 · Jan 21, 2026
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 Log*.txt
-/*.txt
+/*.tt
 input/*.txt
 d.cpp
diff --git a/2014.pdf b/2014.pdf
diff --git a/contact.html b/contact.html
@@ -1,2 +1,7 @@
 fsdvgwsasas
-vvcdfffd
+<<<<<<< HEAD
+vvcdfffd
+Vada Pau
+=======
+vvcdfffdss
+>>>>>>> 8b0ffeb213482cbe2921bd1a073a0114872695ca
diff --git a/halwa.txt b/halwa.txt
@@ -0,0 +1,4 @@
+OMG-1
+ss
+
+Added a line
diff --git a/hsd.pd b/hsd.pd
@@ -0,0 +1 @@
+s
diff --git a/ssd - Copy.txt b/ssd - Copy.txt