fix merge
This commit is contained in:
parent
9efb4636e8
commit
51b6f821df
3
.gitignore
vendored
3
.gitignore
vendored
@ -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/
|
||||
|
@ -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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user