# Conflicts: # ProjectNLD/Assets/Config/Data/bulletcfg_bulletconfig.json |
||
|---|---|---|
| .. | ||
| DataFilterConfig.cs | ||
| DataFilterConfig.cs.meta | ||
| GFilterConfig.cs | ||
| GFilterConfig.cs.meta | ||
# Conflicts: # ProjectNLD/Assets/Config/Data/bulletcfg_bulletconfig.json |
||
|---|---|---|
| .. | ||
| DataFilterConfig.cs | ||
| DataFilterConfig.cs.meta | ||
| GFilterConfig.cs | ||
| GFilterConfig.cs.meta | ||