diff options
author | orwell96 <orwell@bleipb.de> | 2018-12-03 23:17:35 +0100 |
---|---|---|
committer | orwell96 <orwell@bleipb.de> | 2018-12-03 23:17:35 +0100 |
commit | 8928f78ee6305e29ed8d3b9395fcb6564c984fdf (patch) | |
tree | cd250c2b98d7131158e3744efe238780cec73fec /font_metro/depends.txt | |
parent | eccdad46ef2b38cd061aab7ae6bcb252a67c2218 (diff) | |
parent | a3e0d36a68247cac40349d9089fe3c71546d75e8 (diff) | |
download | display_modpack-master.tar.gz display_modpack-master.tar.bz2 display_modpack-master.zip |
Resolved conflicts by reordering of files
Diffstat (limited to 'font_metro/depends.txt')
-rw-r--r-- | font_metro/depends.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/font_metro/depends.txt b/font_metro/depends.txt new file mode 100644 index 0000000..7372f0d --- /dev/null +++ b/font_metro/depends.txt @@ -0,0 +1 @@ +font_api |