[tor-commits] [community/master] Fix merge conflicts

[gus at torproject.org]

commit bdfa8de10c52bc62621053f0617d5ebc79f56764
Merge: 135fe85 8987510
Author: gus <gus at torproject.org>
Date:   Wed Oct 20 10:31:23 2021 -0300

    Fix merge conflicts

 .gitlab/issue_templates/bug.md           | 42 ++++++++++++++++++++++++++++++++
 .gitlab/issue_templates/documentation.md | 35 ++++++++++++++++++++++++++
 .gitlab/issue_templates/feature.md       | 15 ++++++++++++
 .gitlab/issue_templates/proposal.md      |  5 ++++
 4 files changed, 97 insertions(+)