From c7bb53d2bddaf82da9c07cc0c12990f6d0036c8e Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Sat, 9 Jul 2016 13:39:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8Aimagemagick?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 Gemfile    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index fe3677396..1ef7e63ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ vendor/cache
 public/javascripts/wechat/node_modules/
 .ruby-version
 .access_token
+tmux*.log
diff --git a/Gemfile b/Gemfile
index afe85df1d..3bea83669 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ unless RUBY_PLATFORM =~ /w32/
   gem 'iconv'
   if RUBY_PLATFORM =~ /darwin/
     gem "rmagick", "= 2.15.4" ## osx must be this version
-  else
+  elsif RUBY_PLATFORM =~ /linux/
     #gem "rmagick", "= 2.13.1" ## centos yum install ImageMagick-devel
   end
   gem 'certified'