Fix a merge issue with the file.

The issue actually arose due to formatting changes.

git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization_result_distribution@1238 eaa15691-b419-025a-1212-ee371bd00084
1 file changed