fix unmerged changes in .dockerignore
This commit is contained in:
parent
a982c099a1
commit
cb09ece53c
@ -38,14 +38,9 @@ src/plugins/FancyNpcs/logs
|
||||
src/plugins/FancyNpcs/skins
|
||||
src/plugins/FancyNpcs/.data
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
src/plugins/DiscordSRV/accounts.aof
|
||||
|
||||
|
||||
=======
|
||||
src/plugins/ImageFrame/data
|
||||
src/plugins/ImageFrame/player
|
||||
src/plugins/ImageFrame/upload
|
||||
src/map-color-cache.dat
|
||||
>>>>>>> develop
|
||||
|
||||
src/plugins/DiscordSRV/accounts.aof
|
||||
|
Loading…
Reference in New Issue
Block a user