Now that prompts-in-prompts has landed, there are merge conflicts in: src/modules/Unity/Application/mirsurfaceitem.cpp src/modules/Unity/Application/mirsurfaceitem.h
« Back to merge proposal
Now that prompts-in-prompts has landed, there are merge conflicts in: Unity/Applicati on/mirsurfaceit em.cpp Unity/Applicati on/mirsurfaceit em.h
src/modules/
src/modules/