offline email for POS
diff --git a/erpnext/public/js/pos/pos.html b/erpnext/public/js/pos/pos.html
index aa9e80a..3dbf03c 100644
--- a/erpnext/public/js/pos/pos.html
+++ b/erpnext/public/js/pos/pos.html
@@ -55,9 +55,27 @@
<div class="cell"></div>
<div class="cell"></div>
</div>
+<<<<<<< 889e91312e9cfe10a2fd38ba7864e7c7546f4de8
<div class="app-listing item-list image-view-container three-column">
</div>
</div>
</div>
+=======
+ <span id="customer-results" style="color:#68a;"></span>
+ <div class="row pos-item-toolbar">
+ <div class="search-item-group col-xs-5"></div>
+ <div class="search-item col-xs-7"></div>
+ </div>
+ <div class="item-list-area" style="auto">
+ <div class="app-listing item-list"></ul>
+ </div>
+ </div>
+ <div class="row">
+ <div class="text-right list-paging-area">
+ <button class="btn btn-default btn-more btn-sm" style="margin:5px 20px">{{ __("More") }}</button>
+ </div>
+ </div>
+ </div>
+>>>>>>> offline email for POS
</div>