fix conflict

This commit is contained in:
Daiyuu Nobori committed 2016-11-27 17:57:00 +09:00
commit 86d87d1ac4
2 files changed
+3 -2

No files matched your search

+1
View File
@@ -22,4 +22,5 @@ configure_config:
if [ $(shell uname -m) = 'i686' ]; then echo "1\n1\n" | ./configure; fi
if [ $(shell uname -m) = 'armv6l' ]; then echo "1\n1\n" | ./configure; fi
if [ $(shell uname -m) = 'armv7l' ]; then echo "1\n1\n" | ./configure; fi
if [ $(shell uname -m) = 'armv5tel' ]; then echo "1\n1\n" | ./configure; fi