fix

d781926d · Momobako · ceb1796d · d781926d
Commit d781926d authored Apr 12, 2018 by Momobako
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

appveyor.yml appveyor.yml +0 -6

No files found.
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -60,13 +60,7 @@ deploy:
 cache:
  - premake-5.0.0-alpha12-windows.zip
  - libevent-2.0.22-stable.tar.gz
-<<<<<<< HEAD
  - freetype-2.8.1.tar.bz2
  - irrlicht-1.8.4.zip
  - lua-5.3.4.tar.gz
  - sqlite-amalgamation-3210000.zip
-
-=======
-  - lua-5.3.4.tar.gz
-  - sqlite-amalgamation-3200000.zip
->>>>>>> e5df907f03618cd72942838237c5d8b50f841b53