Hello World #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Open

Zeckten wants to merge 2 commits into Spartronics4915:master from Zeckten:master

Zeckten commented Nov 19, 2020

I changed HelloWorld.java to print "Hello, World!" instead of "Hello, Conflicts!"

Zeckten added 2 commits

November 4, 2020 19:22


          Initial commit

ff0f766


          Merge branch 'master' of https://github.com/Spartronics4915/git-learning



Merge conflic commit

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet