Merge branch 'dev' of gitlab.intra.knownsec.com:chuangyudun/galaxy

xiongyj · xiongyj · commit e0f3270a2b0b · 2015-08-20T17:50:19.000+08:00
Conflicts:
	README.md
diff --git a/.gitignore b/.gitignore
@@ -31,3 +31,5 @@ node_modules/
 .tmp
 dist
 /src/main.js
+*.log
+*.orig
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # 创宇盾星图
  * 前端架构:
      + reactjs 创建组件

-Original file line number
+Diff line change
 .tmp
 dist
 /src/main.js
 +*.log
 +*.orig