diff options
| author | Al <26797547+Al12rs@users.noreply.github.com> | 2020-12-02 13:19:41 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 13:19:41 -0800 |
| commit | 258a9e0f5a0df5973df6e660d24ba6f19fb963f1 (patch) | |
| tree | 0cbe87c1139a90fdc1b5947af11e18af41eb62c5 /src/instancemanager.cpp | |
| parent | c3a957169612e6563b17c2e740006f1abd29f6ff (diff) | |
| parent | 44eb0946a7840f726cee0d4ec649a5676cd0498d (diff) | |
Merge pull request #1312 from BlueAmulet/master
Better blue conflict icons
Diffstat (limited to 'src/instancemanager.cpp')
0 files changed, 0 insertions, 0 deletions