Cleanup some merge conflicts

This commit is contained in:
ebaydayz
2016-03-04 14:29:49 -05:00
parent 61c64cb14a
commit 732c2fe5a0
8 changed files with 10 additions and 57 deletions

View File

@@ -1,6 +1,8 @@
/*
Created by Alby exclusively for DayZMod.
Please request permission to use/alter from Alby.
Included in Epoch with permission by @ebaydayz
*/
private ["_items","_counts","_config","_isRecipe","_item","_index","_amount","_count","_entry","_input","_array"];