fix merge

This commit is contained in:
Chloe Fontenot 🏳️‍⚧️ 2022-11-11 13:38:59 -06:00
parent 9efb4636e8
commit 51b6f821df
2 changed files with 4 additions and 0 deletions

3
.gitignore vendored
View File

@ -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/

View File

@ -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>