From 84ce28a76d3434cddc8504e573122b2ae2d606d0 Mon Sep 17 00:00:00 2001
From: Toto <git.demo@gmail.com>
Date: Thu, 16 Feb 2023 15:19:58 +0100
Subject: [PATCH] Conflit2

---
 main.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main.c b/main.c
index afa52cf..6550605 100644
--- a/main.c
+++ b/main.c
@@ -7,3 +7,7 @@ int main() {
 	printf("%d", var);
 
 }
+
+int f() {
+	printf("Patate");
+}