There's a conflict with the new trunk:
""" Text conflict in tests/mocks/Unity/Application/SurfaceManager.h 1 conflicts encountered. """
« Back to merge proposal
There's a conflict with the new trunk:
""" Unity/Applicati on/SurfaceManag er.h
Text conflict in tests/mocks/
1 conflicts encountered.
"""