Akhilesh Darjee 20659d1346 [docs] [minor] merge conflict fixed

2013-10-15 11:25:57 +05:30

..

docs.user.five_day_setup.day_1.md

[docs] [minor] merge conflict fixed

2013-10-15 11:25:57 +05:30

docs.user.five_day_setup.day_2.md

[docs] [cleanup] five day setup docs cleanup

2013-10-14 15:55:19 +05:30

docs.user.five_day_setup.day_3.md

[docs] [minor] merge conflict fixed

2013-10-15 11:25:57 +05:30

docs.user.five_day_setup.day_4.md

[docs] [minor] merge conflict fixed

2013-10-15 11:25:57 +05:30

docs.user.five_day_setup.day_5.md

[docs] [minor] merge conflict fixed

2013-10-15 11:25:57 +05:30

docs.user.five_day_setup.md

[docs] [cleanup] five day setup docs cleanup

2013-10-14 15:55:19 +05:30