Merge remote-tracking branch 'origin/master'

Conflicts: .idea/libraries/appcompat_v7_22_2_1.xml
MotorMike · Oct 18, 2015 · f4734ec · f4734ec
2 parents 0af3db6 + ead1210
commit f4734ec
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/.idea/libraries/appcompat_v7_22_2_1.xml b/.idea/libraries/appcompat_v7_22_2_1.xml
diff --git a/.idea/libraries/design_22_2_1.xml b/.idea/libraries/design_22_2_1.xml
diff --git a/.idea/libraries/support_annotations_22_2_1.xml b/.idea/libraries/support_annotations_22_2_1.xml
diff --git a/.idea/libraries/support_v4_22_2_1.xml b/.idea/libraries/support_v4_22_2_1.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml