diff options
| author | h-v-smacker <hans-von-smacker+github@gmail.com> | 2018-01-21 22:51:54 +0300 |
|---|---|---|
| committer | h-v-smacker <hans-von-smacker+github@gmail.com> | 2018-01-21 22:51:54 +0300 |
| commit | db0939176d994ac65d9c3c726da01cfbff7af3bb (patch) | |
| tree | c268f36073218c33a6b4552d8a5c5f76dcf2ae90 /depends.txt | |
| parent | ffca704cc2b258e58a2a10079d9c49a2c20fe0fe (diff) | |
merging with revamped upstream
Diffstat (limited to 'depends.txt')
| -rw-r--r-- | depends.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/depends.txt b/depends.txt index af2d4c5..b39fd0d 100644 --- a/depends.txt +++ b/depends.txt @@ -1,8 +1,4 @@ default intllib? lucky_block? -<<<<<<< HEAD pipeworks? -======= -pipeworks? ->>>>>>> upstream/master |