Skip to content

Commit 78b71c2

Browse files
committed
Merge branch 'trunk' into issue/6414-fix-more-button-problem-in-product-variations-screen
2 parents 12c6afc + 7ad08b2 commit 78b71c2

File tree

3 files changed

+0
-58
lines changed

3 files changed

+0
-58
lines changed

WooCommerce/Classes/Extensions/UIView+SubviewsAxis.swift

Lines changed: 0 additions & 22 deletions
This file was deleted.

WooCommerce/WooCommerce.xcodeproj/project.pbxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,6 @@
9090
021E2A1C23AA0DD100B1DE07 /* ProductBackordersSettingListSelectorCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021E2A1B23AA0DD100B1DE07 /* ProductBackordersSettingListSelectorCommand.swift */; };
9191
021E2A1E23AA24C600B1DE07 /* StringInputFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021E2A1D23AA24C600B1DE07 /* StringInputFormatter.swift */; };
9292
021E2A2023AA274700B1DE07 /* ProductBackordersSettingListSelectorCommandTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021E2A1F23AA274700B1DE07 /* ProductBackordersSettingListSelectorCommandTests.swift */; };
93-
021FAFCD2355621E00B99241 /* UIView+SubviewsAxisTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021FAFCC2355621E00B99241 /* UIView+SubviewsAxisTests.swift */; };
94-
021FAFCF23556D2B00B99241 /* UIView+SubviewsAxis.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021FAFCE23556D2B00B99241 /* UIView+SubviewsAxis.swift */; };
9593
021FB44C24A5E3B00090E144 /* ProductListMultiSelectorSearchUICommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021FB44B24A5E3B00090E144 /* ProductListMultiSelectorSearchUICommand.swift */; };
9694
0225C42824768A4C00C5B4F0 /* FilterProductListViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0225C42724768A4C00C5B4F0 /* FilterProductListViewModelTests.swift */; };
9795
0225C42A24768CE900C5B4F0 /* FilterProductListViewModelProductListFilterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0225C42924768CE900C5B4F0 /* FilterProductListViewModelProductListFilterTests.swift */; };
@@ -1791,8 +1789,6 @@
17911789
021E2A1B23AA0DD100B1DE07 /* ProductBackordersSettingListSelectorCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductBackordersSettingListSelectorCommand.swift; sourceTree = "<group>"; };
17921790
021E2A1D23AA24C600B1DE07 /* StringInputFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringInputFormatter.swift; sourceTree = "<group>"; };
17931791
021E2A1F23AA274700B1DE07 /* ProductBackordersSettingListSelectorCommandTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductBackordersSettingListSelectorCommandTests.swift; sourceTree = "<group>"; };
1794-
021FAFCC2355621E00B99241 /* UIView+SubviewsAxisTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+SubviewsAxisTests.swift"; sourceTree = "<group>"; };
1795-
021FAFCE23556D2B00B99241 /* UIView+SubviewsAxis.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+SubviewsAxis.swift"; sourceTree = "<group>"; };
17961792
021FB44B24A5E3B00090E144 /* ProductListMultiSelectorSearchUICommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductListMultiSelectorSearchUICommand.swift; sourceTree = "<group>"; };
17971793
0225C42724768A4C00C5B4F0 /* FilterProductListViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterProductListViewModelTests.swift; sourceTree = "<group>"; };
17981794
0225C42924768CE900C5B4F0 /* FilterProductListViewModelProductListFilterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterProductListViewModelProductListFilterTests.swift; sourceTree = "<group>"; };
@@ -6266,7 +6262,6 @@
62666262
B5980A6421AC905C00EBF596 /* UIDeviceWooTests.swift */,
62676263
B57C745020F56EE900EEFC87 /* UITableViewCellHelpersTests.swift */,
62686264
456417F5247D5643001203F6 /* UITableView+HelpersTests.swift */,
6269-
021FAFCC2355621E00B99241 /* UIView+SubviewsAxisTests.swift */,
62706265
F997174623DC070C00592D8E /* XLPagerStrip+AccessibilityIdentifierTests.swift */,
62716266
0215320C2423309B003F2BBD /* UIStackView+SubviewsTests.swift */,
62726267
6856D7981E11F85D5E4EFED7 /* NSMutableAttributedStringHelperTests.swift */,
@@ -6893,7 +6888,6 @@
68936888
02B296A622FA6DB500FD7A4C /* Date+StartAndEnd.swift */,
68946889
02D45646231CB1FB008CF0A9 /* UIImage+Dot.swift */,
68956890
020DD48E232392C9005822B1 /* UIViewController+AppReview.swift */,
6896-
021FAFCE23556D2B00B99241 /* UIView+SubviewsAxis.swift */,
68976891
039D948C27610C6F0044EF38 /* UIView+SafeAreaConstraints.swift */,
68986892
039D948E276113490044EF38 /* UIView+SuperviewConstraints.swift */,
68996893
D88CA757237D1C27005D2F44 /* Ghost+Woo.swift */,
@@ -9230,7 +9224,6 @@
92309224
57EBC92024EEE61800C1D45B /* WooAnalyticsEvent.swift in Sources */,
92319225
57CDABB9252E9BEB00BED88C /* ButtonTableFooterView.swift in Sources */,
92329226
02E4FD7E2306A8180049610C /* StatsTimeRangeBarViewModel.swift in Sources */,
9233-
021FAFCF23556D2B00B99241 /* UIView+SubviewsAxis.swift in Sources */,
92349227
45D875D22611EA2100226C3F /* ListHeaderView.swift in Sources */,
92359228
026B3C57249A046E00F7823C /* TextFieldTextAlignment.swift in Sources */,
92369229
4590B64C261C673B00A6FCE0 /* WeightFormatter.swift in Sources */,
@@ -9601,7 +9594,6 @@
96019594
D8610BDD256F5ABF00A5DF27 /* JetpackErrorViewModelTests.swift in Sources */,
96029595
746791632108D7C0007CF1DC /* WooAnalyticsTests.swift in Sources */,
96039596
2667BFDD252F61C5008099D4 /* RefundShippingDetailsViewModelTests.swift in Sources */,
9604-
021FAFCD2355621E00B99241 /* UIView+SubviewsAxisTests.swift in Sources */,
96059597
DE7B479727A3C4980018742E /* CouponDetailsViewModelTests.swift in Sources */,
96069598
74F3015A2200EC0800931B9E /* NSDecimalNumberWooTests.swift in Sources */,
96079599
D85136CD231E15B800DD0539 /* MockReviews.swift in Sources */,

WooCommerce/WooCommerceTests/Extensions/UIView+SubviewsAxisTests.swift

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)