Author: gates
Date: Mon Mar 5 18:32:05 2012
New Revision: 1297153
URL: http://svn.apache.org/viewvc?rev=1297153&view=rev
Log:
Fixed merge garble left from previous checkin.
Modified:
incubator/hcatalog/trunk/src/test/e2e/hcatalog/tests/pig.conf
Modified: incubator/hcatalog/trunk/src/test/e2e/hcatalog/tests/pig.conf
URL:
http://svn.apache.org/viewvc/incubator/hcatalog/trunk/src/test/e2e/hcatalog/tests/pig.conf?rev=1297153&r1=1297152&r2=1297153&view=diff
==============================================================================
--- incubator/hcatalog/trunk/src/test/e2e/hcatalog/tests/pig.conf (original)
+++ incubator/hcatalog/trunk/src/test/e2e/hcatalog/tests/pig.conf Mon Mar 5
18:32:05 2012
@@ -303,7 +303,5 @@ store a into ':OUTPATH:';\,
}
],
}, # end g
-
->>>>>>> .r1296703
]
}
