解决冲突

6 years ago · a8d64e8f49
parent 29e661019b
commit a8d64e8f49
2 changed files with 2 additions and 1 deletions
--- a/lib/grack/bin/console
+++ b/lib/grack/bin/console
@ -1,5 +1,6 @@
 #! /bin/bash

+###
 set -e

 cd $(dirname "$0")/..
--- a/lib/wechat/bin/wechat
+++ b/lib/wechat/bin/wechat
@ -1,6 +1,6 @@
 #coding=utf-8
 #!/usr/bin/env ruby
-
+###
 lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)