Skip to content
  • Schuhbaeck, Stefan's avatar
    # Conflicts: · 1caba523
    Schuhbaeck, Stefan authored
    #	Tools/PythonTraciWrapper/pythontraciwrapper/__init__.py
    #	Tools/PythonTraciWrapper/pythontraciwrapper/_api_wrapper.py
    #	Tools/PythonTraciWrapper/pythontraciwrapper/_controll_wrapper.py
    #	Tools/PythonTraciWrapper/pythontraciwrapper/_personapi_wrapper.py
    #	Tools/PythonTraciWrapper/pythontraciwrapper/_polygonapi_wrapper.py
    #	Tools/PythonTraciWrapper/pythontraciwrapper/_simulationapi_wrapper.py
    #	Tools/PythonTraciWrapper/pythontraciwrapper/_vadereapi_wrapper.py
    #	Tools/PythonTraciWrapper/pythontraciwrapper/py4j_client.py
    #	Tools/PythonTraciWrapper/setup.py
    
    # Conflicts:
    #	Tools/PythonTraciWrapper/pythontraciwrapper/__init__.py
    #	Tools/PythonTraciWrapper/pythontraciwrapper/_api_wrapper.py
    #	Tools/PythonTraciWrapper/pythontraciwrapper/_controll_wrapper.py
    #	Tools/PythonTraciWrapper/pythontraciwrapper/_personapi_wrapper.py
    #	Tools/PythonTraciWrapper/pythontraciwrapper/_polygonapi_wrapper.py
    #	Tools/PythonTraciWrapper/pythontraciwrapper/_simulationapi_wrapper.py
    #	Tools/PythonTraciWrapper/pythontraciwrapper/_vadereapi_wrapper.py
    #	Tools/PythonTraciWrapper/pythontraciwrapper/py4j_client.py
    #	Tools/PythonTraciWrapper/setup.py
    
    # Conflicts:
    #	Tools/PythonTraciWrapper/setup.py
    1caba523