fix merge bug

ea247f50 · xiaoli.liu@intel.com · dfca08cf · ea247f50
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

python/paddle/fluid/transpiler/distribute_transpiler.py python/paddle/fluid/transpiler/distribute_transpiler.py +0 -1

未找到文件。
--- 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: