diff options
author | kytwb <kytwb@pm.me> | 2022-01-03 12:23:20 +0100 |
---|---|---|
committer | kytwb <kytwb@pm.me> | 2022-01-03 12:23:20 +0100 |
commit | da8e4a4ece93848e89af7013eeb77947fdd5217a (patch) | |
tree | 3853e0ffcd4eca0abe789355fe50fcc6ee8e7225 /src/electron/exception.ts | |
parent | Merge branch 'release' into develop (diff) | |
download | ferdium-app-da8e4a4ece93848e89af7013eeb77947fdd5217a.tar.gz ferdium-app-da8e4a4ece93848e89af7013eeb77947fdd5217a.tar.zst ferdium-app-da8e4a4ece93848e89af7013eeb77947fdd5217a.zip |
#2383 Fix unaddressed merge conflict
Diffstat (limited to 'src/electron/exception.ts')
0 files changed, 0 insertions, 0 deletions