diff options
author | Alan Pearce | 2024-05-15 20:29:56 +0200 |
---|---|---|
committer | Alan Pearce | 2024-05-15 20:29:56 +0200 |
commit | d65d80e1133eebf11cc1adb3438a1cc53635185f (patch) | |
tree | b53e6df1b6f5b12209a750c9b3a9db1abfcf7696 /frontend/templates/blocks/error.gotmpl | |
parent | 5521173ea0e05bda93096b51f67c5e813cb1d87e (diff) | |
download | searchix-d65d80e1133eebf11cc1adb3438a1cc53635185f.tar.lz searchix-d65d80e1133eebf11cc1adb3438a1cc53635185f.tar.zst searchix-d65d80e1133eebf11cc1adb3438a1cc53635185f.zip |
fix: bad git conflict resolution
Diffstat (limited to 'frontend/templates/blocks/error.gotmpl')
0 files changed, 0 insertions, 0 deletions