nyampah

src/client/TCPClient/nbproject/private/private.xml

@@ -3,11 +3,7 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-<<<<<<< HEAD
             <file>file:/C:/Users/Kevin%20Zhong/Documents/NetBeansProjects/Coba/src/client/TCPClient/src/TCPClient.java</file>
-=======
-            <file>file:/C:/Users/Jonathan/Documents/NetBeansProjects/GrandQuest/src/client/TCPClient/src/TCPClient.java</file>
->>>>>>> origin/JSON-connect
         </group>
     </open-files>
 </project-private>

src/server/TCPServer/nbproject/private/private.xml

@@ -3,7 +3,11 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
+            <file>file:/C:/Users/Kevin%20Zhong/Documents/NetBeansProjects/Coba/src/server/TCPServer/src/ConnectionHandler.java</file>
             <file>file:/C:/Users/Kevin%20Zhong/Documents/NetBeansProjects/Coba/src/server/TCPServer/src/crudDB/crudDB.java</file>
+            <file>file:/C:/Users/Kevin%20Zhong/Documents/NetBeansProjects/Coba/src/server/TCPServer/src/Client.java</file>
+            <file>file:/C:/Users/Kevin%20Zhong/Documents/NetBeansProjects/Coba/src/server/TCPServer/src/TCPServer.java</file>
+            <file>file:/C:/Users/Kevin%20Zhong/Documents/NetBeansProjects/Coba/src/server/TCPServer/src/EndpointMethod.java</file>
         </group>
     </open-files>
 </project-private>