From ad90f1aa27741172a762f9fdbfbe0dca78680d0e Mon Sep 17 00:00:00 2001
From: Chloe Christine Fontenot <foley2431@gmail.com>
Date: Sun, 19 Oct 2025 21:30:57 -0500
Subject: [PATCH] fix merge

---
 .gitignore                                              | 3 +++
 Exams/Exam2_CalebFontenot/nbproject/private/private.xml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7e3f03e..b066057 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,6 @@
 /Assignments/lab14_CalebFontenot/build/
 /Assignments/MP4_CalebFontenot/build/
 /Assignments/MP4_CalebFontenot/dist/
+/Assignments/lab15_CalebFontenot/nbproject/private/
+/Assignments/lab15_CalebFontenot/build/
+/Assignments/lab15_CalebFontenot/dist/
diff --git a/Exams/Exam2_CalebFontenot/nbproject/private/private.xml b/Exams/Exam2_CalebFontenot/nbproject/private/private.xml
index c3112ac..6e2a37a 100644
--- a/Exams/Exam2_CalebFontenot/nbproject/private/private.xml
+++ b/Exams/Exam2_CalebFontenot/nbproject/private/private.xml
@@ -4,6 +4,7 @@
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
             <file>file:/home/caleb/ASDV-Java/Exams/Exam2_CalebFontenot/src/exam2_calebfontenot/Problem3.java</file>
+            <file>file:/home/caleb/ASDV-Java/Exams/Exam2_CalebFontenot/src/exam2_calebfontenot/Problem1.java</file>
         </group>
     </open-files>
 </project-private>