Skip to content

Commit 836a91b

Browse files
committed
Resolved Conflicts of coyrights
1 parent 8012cb8 commit 836a91b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright 2021 Adobe
3+
* Copyright 2014 Adobe
44
* All Rights Reserved.
55
*/
66

app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright 2017 Adobe
3+
* Copyright 2014 Adobe
44
* All Rights Reserved.
55
*/
66

app/code/Magento/CatalogInventory/Model/StockRegistry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright 2017 Adobe
3+
* Copyright 2014 Adobe
44
* All Rights Reserved.
55
*/
66

app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
/**
3-
* Copyright 2024 Adobe
3+
* Copyright 2014 Adobe
44
* All Rights Reserved.
55
*/
66
namespace Magento\CatalogInventory\Model;

0 commit comments

Comments
 (0)