fix merge

This commit is contained in:
2025-10-19 21:30:57 -05:00
parent 49a1a0477a
commit ad90f1aa27
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/