aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorDoKM <mcazzyman@gmail.com>2021-07-22 09:57:31 +0200
committerDoKM <mcazzyman@gmail.com>2021-07-22 09:57:31 +0200
commitbefa3f0f8aeb0166bf84dddd14f6b4fabc236cf0 (patch)
tree4ef5014cf74f57ef52fa2650703de7b8f1153f6c /src/main/resources
parentaebc16a2a5ca9c20affc27eb5a45cd9a95085168 (diff)
parentc1c4562b42d53ec2e8885c48f97249d7768fe1c7 (diff)
downloadNotEnoughUpdates-befa3f0f8aeb0166bf84dddd14f6b4fabc236cf0.tar.gz
NotEnoughUpdates-befa3f0f8aeb0166bf84dddd14f6b4fabc236cf0.tar.bz2
NotEnoughUpdates-befa3f0f8aeb0166bf84dddd14f6b4fabc236cf0.zip
Fix merge conflicts for moulberry
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/assets/notenoughupdates/test.gifbin338 -> 0 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/notenoughupdates/test.gif b/src/main/resources/assets/notenoughupdates/test.gif
deleted file mode 100644
index 23c07e5d..00000000
--- a/src/main/resources/assets/notenoughupdates/test.gif
+++ /dev/null
Binary files differ