Skip to content
Snippets Groups Projects
Commit 33b327e2 authored by Mahboobe Shakeri's avatar Mahboobe Shakeri
Browse files

Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/Main.java
parents 45d72c6c ff4bcf96
No related merge requests found
......@@ -9,7 +9,7 @@ public class Main {
//TIP Press <shortcut actionId="ShowIntentionActions"/> with your caret at the highlighted text
// to see how IntelliJ IDEA suggests fixing it.
System.out.println("changes in the merge");
System.out.println("Hello Mahboobe");
System.out.println("Hello Class from merge request!");
HashMap<String, Integer> grades = new HashMap<>();
grades.put("Mahboobe", 87);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment