LP1999432 Add PubDate to shelf browse list.

Adds pubdate to the shelf browse list of the staff client.

Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Gina Monti <gmonti@biblio.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html
index 3486470..6ac9738 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/cnbrowse/results.component.html
@@ -57,12 +57,21 @@
                   {{callNumber._bibSummary.display.author}}
                 </a>
               </div>
+<<<<<<< HEAD
               <ng-container *ngIf="callNumber._bibSummary.display.pubdate"> 
                 <div class="d-flex">
                 <div class="flex1" i18n>PubDate:</div>
                 <div class="flex1 px-1">{{callNumber._bibSummary.display.pubdate}}</div>
                 </div>
               </ng-container>
+=======
+             <ng-container *ngIf="callNumber._bibSummary.display.pubdate"> 
+                 <div class="d-flex">
+                     <div class="flex1" i18n>PubDate:</div>
+                     <div class="flex1 px-1">{{callNumber._bibSummary.display.pubdate}}</div>
+                 </div>
+             </ng-container>
+>>>>>>> bf61730e39... LP1999432 Add PubDate to shelf browse list.
             </div>
             <div class="ml-2">
               <img src="/opac/extras/ac/jacket/small/r/{{callNumber._bibSummary.id}}"/>