Merge remote-tracking branch 'comwrap/async-status-search' into bulk-status-search

vrann · vrann · commit 9bd966f21e38 · 2018-06-27T07:40:48.000-05:00
# Conflicts:
#	app/code/Magento/AsynchronousOperations/Api/Data/OperationSearchResultsInterface.php
#	app/code/Magento/AsynchronousOperations/Model/OperationRepository.php
diff --git a/app/code/Magento/AsynchronousOperations/Api/Data/OperationSearchResultsInterface.php b/app/code/Magento/AsynchronousOperations/Api/Data/OperationSearchResultsInterface.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */

-Original file line number
+Diff line change
@@ @@ -1,6 +1,5 @@ @@
 <?php
 /**
 - *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */