Fix merge conflict

AY2425S1-CS2103T-W14-3 · Nov 11, 2024 · 846d094 · 846d094
2 parents 3712834 + 081dc61
commit 846d094
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 53 deletions.
diff --git a/copyright.txt b/copyright.txt
@@ -1,4 +1,9 @@
 Some code adapted from http://code.makery.ch/library/javafx-8-tutorial/ by Marco Jakob
 
 Copyright by Susumu Yoshida - http://www.mcdodesign.com/
-- address_book_32.png (renamed to hall_pointer_32.png)
+- address_book_32.png
+- AddressApp.ico
+
+Copyright by Jan Jan Kovařík - http://glyphicons.com/
+- calendar.png
+- edit.png