Cleaning up and styling picture upload page. Second try for this patch.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
index 143483c..7fdc7b6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
@@ -31,7 +31,11 @@
 <!-- TMPL_ELSE -->
 
     <!-- TMPL_IF name="ERRORS" -->
+<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
         <div class="dialog alert"><ul>
+=======
+        <ul class="error">
+>>>>>>> Cleaning up and styling picture upload page. Second try for this patch.:koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
         <!-- TMPL_LOOP name="ERRORS" -->
                <!-- TMPL_IF NAME="NODIR" -->
                        <li>The <span class="ex">patronimages/</span> directory isn't present on your server, please ask your systems administrator to create it</li>
@@ -49,7 +53,11 @@
             <li>The upload file appears to be empty.</li>
         <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
+<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
                </ul></div>
+=======
+               </ul>
+>>>>>>> Cleaning up and styling picture upload page. Second try for this patch.:koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
     <!-- /TMPL_IF -->
        
        <form method="post" action="/cgi-bin/koha/tools/picture-upload.pl" enctype="multipart/form-data">