master - konflikt

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();