Adding #conflict-management tag. - annna - Annna the nice friendly bot.
 (HTM) git clone git://bitreich.org/annna/ git://enlrupgkhuxnvlhsf6lc3fziv5h2hhfrinws65d7roiv6bfj7d652fid.onion/annna/
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) Tags
 (DIR) README
       ---
 (DIR) commit 0f985222105ab4253ee4d6a1cb6fb6e62bafcd87
 (DIR) parent c7a54141a36ff7827ac0dff99c8c579d9d8e154c
 (HTM) Author: Annna Robert-Houdin <annna@bitreich.org>
       Date:   Tue, 14 Jun 2022 15:35:43 +0200
       
       Adding #conflict-management tag.
       
       Diffstat:
         M modules/hashtags/hashtags.txt       |       1 +
       
       1 file changed, 1 insertion(+), 0 deletions(-)
       ---
 (DIR) diff --git a/modules/hashtags/hashtags.txt b/modules/hashtags/hashtags.txt
       @@ -3313,6 +3313,7 @@
        #conference-participation gopher://bitreich.org/9/memecache/conference-participation.mkv
        #config-update gopher://bitreich.org/I/memecache/config-update.jpg
        #confirmation-number gopher://bitreich.org/9/memecache/confirmation-number.webm
       +#conflict-management gopher://bitreich.org/9/memecache/conflict-management.webm
        #confusion gopher://bitreich.org/I/memecache/confusion.jpg
        #conga gopher://bitreich.org/9/memecache/conga.webm
        #congratulations gopher://bitreich.org/9/memecache/congratulations.mkv