fix indention, revert merge failures
authorWilfried Goesgens <willi@arangodb.com>
Thu, 28 Sep 2017 09:34:42 +0000 (11:34 +0200)
committerWilfried Goesgens <willi@arangodb.com>
Thu, 28 Sep 2017 09:34:42 +0000 (11:34 +0200)

No differences found