From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 18 Sep 2009 21:49:06 +0000 (+0000)
Subject: kill merged line
X-Git-Tag: v3.2a1~2526
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f38a69f97954aae455b87391723a9936dcd313a1;p=python

kill merged line
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 78ef7e1c6e..767bed0776 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -8822,7 +8822,6 @@ static PyMethodDef unicode_methods[] = {
     {"ljust", (PyCFunction) unicode_ljust, METH_VARARGS, ljust__doc__},
     {"lower", (PyCFunction) unicode_lower, METH_NOARGS, lower__doc__},
     {"lstrip", (PyCFunction) unicode_lstrip, METH_VARARGS, lstrip__doc__},
-/*  {"maketrans", (PyCFunction) unicode_maketrans, METH_VARARGS, maketrans__doc__}, */
     {"rfind", (PyCFunction) unicode_rfind, METH_VARARGS, rfind__doc__},
     {"rindex", (PyCFunction) unicode_rindex, METH_VARARGS, rindex__doc__},
     {"rjust", (PyCFunction) unicode_rjust, METH_VARARGS, rjust__doc__},