resolve conflict: index.html

This commit is contained in:
sundeep-co-in
2016-10-31 23:40:56 +05:30
314 changed files with 11615 additions and 15591 deletions

View File

@@ -40,5 +40,7 @@ make version_file
make migrate
make init
mkdir -p /tower_devel/awx/public/static
# Start the service
make honcho