From 6d621da0a6efeda74a97f224df831afe55088e39 Mon Sep 17 00:00:00 2001
From: Andrzej Lopko <andrzejlopko@gmail.com>
Date: Tue, 3 Feb 2026 20:35:30 +0100
Subject: [PATCH] master - konflikt

---
 src/Main.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Main.java b/src/Main.java
index 55627f5..733495a 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -31,7 +31,7 @@ public class Main {
 public static void main(String[] args) {
         //TIP Press <shortcut actionId="ShowIntentionActions"/> with your caret at the highlighted text
         // to see how IntelliJ IDEA suggests fixing it.
-        System.out.printf("Hello and welcome!");
+        System.out.printf("Hello anasd welcome!");
 
         Test x = new Test();
         x.test();