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 /signs_road/depends.txt | |
parent | eccdad46ef2b38cd061aab7ae6bcb252a67c2218 (diff) | |
parent | a3e0d36a68247cac40349d9089fe3c71546d75e8 (diff) | |
download | display_modpack-8928f78ee6305e29ed8d3b9395fcb6564c984fdf.tar.gz display_modpack-8928f78ee6305e29ed8d3b9395fcb6564c984fdf.tar.bz2 display_modpack-8928f78ee6305e29ed8d3b9395fcb6564c984fdf.zip |
Resolved conflicts by reordering of files
Diffstat (limited to 'signs_road/depends.txt')
-rw-r--r-- | signs_road/depends.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/signs_road/depends.txt b/signs_road/depends.txt index 730e727..eeb3b01 100644 --- a/signs_road/depends.txt +++ b/signs_road/depends.txt @@ -1,6 +1,6 @@ default intllib? dye -display_lib -font_lib -signs +display_api +font_api +signs_api |