From c178cbdc129d41b14685b8728a13af22526b1b23 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Sat, 18 Sep 2021 17:45:54 +0100
Subject: [PATCH] Resolve merge conflict

---
 src/notification/bar.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/notification/bar.html b/src/notification/bar.html
index f50db6e5fd..d352b2133c 100644
--- a/src/notification/bar.html
+++ b/src/notification/bar.html
@@ -27,9 +27,12 @@
             <tbody>
                 <tr>
                     <td class="add-text"></td>
+                    <td align="right">
+                        <button class="never-save link"></button>
+                    </td>
                     <td align="right" class="add-buttons">
-                        <button type="button" class="never-save link"></button>
-                        <button type="button" class="add-save"></button>
+                        <select class="select-folder"></select>
+                        <button class="add-save"></button>
                     </td>
                 </tr>
             </tbody>