njnl · Meralinka · Nov 23, 2021 · Nov 28, 2021 · Nov 28, 2021 · Nov 28, 2021
diff --git a/leap-year.py b/leap-year.py
@@ -3,7 +3,7 @@
 
     print("THIS IS JUST A LEAP YEAR!)
 else:
-    print("The year isn't a leap year!)
+    print("The year is not a leap year!)
 
 
           hello
diff --git a/leap_year.py b/leap_year.py
@@ -0,0 +1,8 @@
+<<<<<<< HEAD
+herhangi bir satır ekledik
+
+14,12,2021(remote)
+=======
+herhangi bir satır ekledik 
+bir kaç satırlık işlem github üzerinden yapıldı "
+>>>>>>> dev
diff --git a/test.txt b/test.txt
diff --git a/test2.txt b/test2.txt