From 2b010427d1bdccca6a68597e49415b55da72faaf Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleishaamohia@hotmail.com>
Date: Fri, 2 Jun 2017 03:26:11 +0000
Subject: [PATCH] Bug 12365: [FOLLOW-UP] Follow-up patch

This patch fixes merge conflicts and removes an existing
note from the input field (as per Comment 3)
---
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index a0df8f9..ace2c94 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -387,7 +387,7 @@ $(document).ready(function() {
                         </select>
                     </td>
                     <td><input type="text" name="rentaldiscount" id="rentaldiscount" size="2" /></td>
-                    <td><input type="text" name="note" id="note" size="15" value="[% rule.note %]"></td>
+                    <td><input type="text" name="note" id="note" size="15" value=""></td>
                     <td class="actions">
                         <input type="hidden" name="branch" value="[% current_branch %]"/>
                         <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
-- 
2.1.4