Added conflicting changes into my sidebar-left.tpl file

CMU-17313Q · Sep 26, 2024 · 51634c7 · 51634c7
1 parent 7264727
commit 51634c7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/dump.rdb b/dump.rdb
diff --git a/node_modules/nodebb-theme-harmony/templates/partials/sidebar-left.tpl b/node_modules/nodebb-theme-harmony/templates/partials/sidebar-left.tpl