From 8e8625a1867565ed2408efcbb2d78bc1755cfa50 Mon Sep 17 00:00:00 2001
From: Zoomer234 <fruitbat234@gmail.com>
Date: Wed, 18 Nov 2020 19:12:53 -0800
Subject: [PATCH] Changed Hello Conflicts! to Hello World!

---
 HelloWorld.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HelloWorld.java b/HelloWorld.java
index 3b460f7..db1db64 100644
--- a/HelloWorld.java
+++ b/HelloWorld.java
@@ -1,5 +1,5 @@
 public class HelloWorld {
 	public static void main(String[] args) {
-		System.out.println("Hello, Conflicts!");
+		System.out.println("Hello, World!");
 	}
 }