浏览代码

Clean up junk from fonts uuid

Colin Powell 6 年之前
父节点
当前提交
8fc197750b
共有 1 个文件被更改,包括 0 次插入7 次删除
  1. 0 7
      fonts/.fonts/iosevka-2.2.1/woff2/.uuid

+ 0 - 7
fonts/.fonts/iosevka-2.2.1/woff2/.uuid

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