From ea247f50b24cb59a9e258ecc49dfec077165dda4 Mon Sep 17 00:00:00 2001 From: "xiaoli.liu@intel.com" Date: Mon, 3 Dec 2018 16:03:09 +0800 Subject: [PATCH] fix merge bug --- python/paddle/fluid/transpiler/distribute_transpiler.py | 1 - 1 file changed, 1 deletion(-) diff --git a/python/paddle/fluid/transpiler/distribute_transpiler.py b/python/paddle/fluid/transpiler/distribute_transpiler.py index b6de0e9a99e..5d348f0995f 100644 --- a/python/paddle/fluid/transpiler/distribute_transpiler.py +++ b/python/paddle/fluid/transpiler/distribute_transpiler.py @@ -193,7 +193,6 @@ class DistributeTranspiler(object): trainer_id=trainer_id ) """ ->>>>>>> develop def __init__(self, config=None): if config is not None: -- GitLab