Fiddling with git to fix broken commit.

2018-08-10 18:15:04 +02:00
parent e3f646a1fa
commit ae0ca35fdb
3 changed files with 0 additions and 4 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,9 @@
 # Refined Storage Changelog

-<<<<<<< HEAD
 ### 1.6.4
 - Rewrote autocrafting again (raoulvdberge)
 - Reworked the Crafting Monitor (raoulvdberge)
- Optimized image sizes and improved image compression (samtrion)

-=======
->>>>>>> parent of fea420aa... Image sizes optimized (#1944)
 ### 1.6.3
 - Fixed crash with Wireless Fluid Grid (raoulvdberge)
 - Fixed Reborn Storage crafting being slower than normal (raoulvdberge)
--- a/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png
+++ b/src/main/resources/assets/refinedstorage/textures/gui/crafting_monitor.png
--- a/src/main/resources/assets/refinedstorage/textures/gui/crafting_preview.png
+++ b/src/main/resources/assets/refinedstorage/textures/gui/crafting_preview.png