Clean up junk from fonts uuid
This commit is contained in:
@ -1,7 +0,0 @@
|
||||
<<<<<<< Updated upstream
|
||||
9151d470-11e7-49d0-8506-97ce582ac744
|
||||
||||||| merged common ancestors
|
||||
c14771fc-3a4a-4e14-8d32-07582bd840bc
|
||||
=======
|
||||
cd0db777-43b9-4786-9f9d-63955587166c
|
||||
>>>>>>> Stashed changes
|
||||
Reference in New Issue
Block a user