From eb5b7231f31c9d21ba4a7baef0f7f4580448afd1 Mon Sep 17 00:00:00 2001
From: Andy <azhang19642@gmail.com>
Date: Mon, 18 Sep 2023 16:14:10 -0400
Subject: [PATCH 1/6] first

---
 .idea/.gitignore  |  8 ++++++++
 .idea/misc.xml    |  6 ++++++
 .idea/modules.xml |  8 ++++++++
 .idea/vcs.xml     |  6 ++++++
 multiset-adt.iml  | 12 ++++++++++++
 src/Tree.java     |  3 +++
 6 files changed, 43 insertions(+)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 multiset-adt.iml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..a818314
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..0512aaa
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/multiset-adt.iml" filepath="$PROJECT_DIR$/multiset-adt.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/multiset-adt.iml b/multiset-adt.iml
new file mode 100644
index 0000000..e5d2daf
--- /dev/null
+++ b/multiset-adt.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/Tree.java b/src/Tree.java
index 458a7c7..ae8bae2 100644
--- a/src/Tree.java
+++ b/src/Tree.java
@@ -1,2 +1,5 @@
 public class Tree {
+    public static void main(String[] args) {
+
+    }
 }

From bad7f74c7da71ea7e5973cbccda145075f764d92 Mon Sep 17 00:00:00 2001
From: Andy <azhang19642@gmail.com>
Date: Mon, 18 Sep 2023 16:43:52 -0400
Subject: [PATCH 2/6] t

---
 src/Tree.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Tree.java b/src/Tree.java
index ae8bae2..fbf1eb5 100644
--- a/src/Tree.java
+++ b/src/Tree.java
@@ -1,5 +1,5 @@
 public class Tree {
-    public static void main(String[] args) {
-
+    public void p() {
+        System.out.println("Hello");
     }
 }

From 40f221089274eca8d79ebeaae56f98f5c68bbe76 Mon Sep 17 00:00:00 2001
From: Ahassini04 <65055446+Ahassini04@users.noreply.github.com>
Date: Mon, 18 Sep 2023 16:45:20 -0400
Subject: [PATCH 3/6] merge

---
 .idea/misc.xml | 3 +--
 src/Tree.java  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index a818314..a020ccd 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" project-jdk-name="18" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/Tree.java b/src/Tree.java
index ae8bae2..625659c 100644
--- a/src/Tree.java
+++ b/src/Tree.java
@@ -1,5 +1,5 @@
 public class Tree {
-    public static void main(String[] args) {
+    public void x() {
 
     }
 }

From 2dcc4eed2ab0bd49857d8c0f12e1b11251a404a5 Mon Sep 17 00:00:00 2001
From: Andy <azhang19642@gmail.com>
Date: Mon, 18 Sep 2023 16:50:42 -0400
Subject: [PATCH 4/6] t

---
 src/Tree.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Tree.java b/src/Tree.java
index a355b83..c43c782 100644
--- a/src/Tree.java
+++ b/src/Tree.java
@@ -1,7 +1,3 @@
 public class Tree {
-    public void p() {
-        System.out.println("Hello");
-    }
-    public void x() {
-    }
+
 }

From 6e9a03847bc2937f399df17f0ad7d54451275839 Mon Sep 17 00:00:00 2001
From: Ahassini04 <65055446+Ahassini04@users.noreply.github.com>
Date: Mon, 18 Sep 2023 16:55:41 -0400
Subject: [PATCH 5/6] merge

---
 src/Tree.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Tree.java b/src/Tree.java
index c43c782..ae8bae2 100644
--- a/src/Tree.java
+++ b/src/Tree.java
@@ -1,3 +1,5 @@
 public class Tree {
+    public static void main(String[] args) {
 
+    }
 }

From 1fae3bf53eeb1018384ef6f2ae4d5e4cd1aa9d16 Mon Sep 17 00:00:00 2001
From: Andy <azhang19642@gmail.com>
Date: Mon, 18 Sep 2023 16:55:42 -0400
Subject: [PATCH 6/6] test

---
 src/Tree.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Tree.java b/src/Tree.java
index c43c782..4aeadc2 100644
--- a/src/Tree.java
+++ b/src/Tree.java
@@ -1,3 +1,5 @@
 public class Tree {
-
+    public static void main(String[] args) {
+        System.out.println("Hello World");
+    }
 }