tree af1238a22e804762b0780cbf69b381a3dd7967d1
parent d05051ecd75838b702fcf233c655c51c9e6f0d4a
author madhusudancs@gmail.com <madhusudancs@gmail.com@eaa15691-b419-025a-1212-ee371bd00084> 1361620307 +0000
committer madhusudancs@gmail.com <madhusudancs@gmail.com@eaa15691-b419-025a-1212-ee371bd00084> 1361620307 +0000

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