From bacbb47bbbcf68e4fe15ab4e7c9e3254f7c89035 Mon Sep 17 00:00:00 2001
From: liangbo <liangbo@qiaxz.com>
Date: Mon, 5 Dec 2016 10:22:37 +0800
Subject: [PATCH 1/6] branch test

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 70ad263..d600635 100644
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-<h1>hello world!</h1>
\ No newline at end of file
+<h1>test!</h1>
\ No newline at end of file

From 307acbf23e1078583017b2ac2701550227a66872 Mon Sep 17 00:00:00 2001
From: liangbo <liangbo@qiaxz.com>
Date: Mon, 5 Dec 2016 10:57:58 +0800
Subject: [PATCH 2/6] add gitignore

---
 .gitignore | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c6cbe56
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures

From b96d8bf7d194ee41b88be4898d44f7e78a831639 Mon Sep 17 00:00:00 2001
From: liangbo <liangbo@qiaxz.com>
Date: Mon, 5 Dec 2016 11:07:21 +0800
Subject: [PATCH 3/6] test..

---
 .gitignore                    | 2 +-
 .idea/libraries/aaa.txt       | 0
 app/.gitignore                | 8 ++++++++
 app/a/.idea/libraries/aaa.txt | 0
 4 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 .idea/libraries/aaa.txt
 create mode 100644 app/.gitignore
 create mode 100644 app/a/.idea/libraries/aaa.txt

diff --git a/.gitignore b/.gitignore
index c6cbe56..8a1c7ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 .gradle
 /local.properties
 /.idea/workspace.xml
-/.idea/libraries
+*/.idea/libraries
 .DS_Store
 /build
 /captures
diff --git a/.idea/libraries/aaa.txt b/.idea/libraries/aaa.txt
new file mode 100644
index 0000000..e69de29
diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 0000000..c6cbe56
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1,8 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures
diff --git a/app/a/.idea/libraries/aaa.txt b/app/a/.idea/libraries/aaa.txt
new file mode 100644
index 0000000..e69de29

From 55663181175e68717b3f58e0b268b1e697771f34 Mon Sep 17 00:00:00 2001
From: liangbo <liangbo@qiaxz.com>
Date: Mon, 5 Dec 2016 11:21:18 +0800
Subject: [PATCH 4/6] aa

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8a1c7ab..c6cbe56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 .gradle
 /local.properties
 /.idea/workspace.xml
-*/.idea/libraries
+/.idea/libraries
 .DS_Store
 /build
 /captures

From 366b42d3e20157fdefdad9e96ec94bf17c0cd541 Mon Sep 17 00:00:00 2001
From: liangbo <liangbo@qiaxz.com>
Date: Mon, 5 Dec 2016 11:27:27 +0800
Subject: [PATCH 5/6] test

---
 .gitignore              | 2 +-
 .idea/libraries/aaa.txt | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 .idea/libraries/aaa.txt

diff --git a/.gitignore b/.gitignore
index c6cbe56..a0466f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 .gradle
 /local.properties
 /.idea/workspace.xml
-/.idea/libraries
+../.idea/libraries
 .DS_Store
 /build
 /captures
diff --git a/.idea/libraries/aaa.txt b/.idea/libraries/aaa.txt
deleted file mode 100644
index e69de29..0000000

From cbd5cb9d9ee2d487f37806a872275c7731b6e030 Mon Sep 17 00:00:00 2001
From: liangbo <liangbo@qiaxz.com>
Date: Mon, 5 Dec 2016 11:32:44 +0800
Subject: [PATCH 6/6] test

---
 .idea/libraries/aaabbb.txt | 0
 .idea/libraries/ccc.txt    | 0
 .idea/libraries/ddd.txt    | 0
 app/a/.gitignore           | 8 ++++++++
 4 files changed, 8 insertions(+)
 create mode 100644 .idea/libraries/aaabbb.txt
 create mode 100644 .idea/libraries/ccc.txt
 create mode 100644 .idea/libraries/ddd.txt
 create mode 100644 app/a/.gitignore

diff --git a/.idea/libraries/aaabbb.txt b/.idea/libraries/aaabbb.txt
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/libraries/ccc.txt b/.idea/libraries/ccc.txt
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/libraries/ddd.txt b/.idea/libraries/ddd.txt
new file mode 100644
index 0000000..e69de29
diff --git a/app/a/.gitignore b/app/a/.gitignore
new file mode 100644
index 0000000..c6cbe56
--- /dev/null
+++ b/app/a/.gitignore
@@ -0,0 +1,8 @@
+*.iml
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/captures