Clean up some bad/missed merges from the alterl merge.
authorDavid Reiss <dreiss@apache.org>
Wed, 11 Jun 2008 01:16:29 +0000 (01:16 +0000)
committerDavid Reiss <dreiss@apache.org>
Wed, 11 Jun 2008 01:16:29 +0000 (01:16 +0000)
commitcc0c9e98b50b4d5510b485ddd0f44614671616fd
treea9b28a1e4ae9a6286676e76d345abb9173ac7e60
parentcb13729795173b2763e0ccec3412c9188bfba6a2
Clean up some bad/missed merges from the alterl merge.

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@666486 13f79535-47bb-0310-9956-ffa450edef68
compiler/cpp/src/generate/t_erl_generator.cc
lib/erl/Makefile
test/py/TestServer.py