Fix merge issues

winterhazel · winterhazel · commit 01b9393a2292 · 2026-04-30T11:27:53.000-03:00
diff --git a/plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java b/plugins/database/quota/src/test/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImplTest.java
@@ -893,7 +893,6 @@ public void injectUsageTypeVariablesTestReturnInjectedVariables() {
         Assert.assertTrue(formattedVariables.containsValue("zonename"));
     }
 
-<<<<<<< HEAD
     private List<QuotaBalanceVO> getQuotaBalancesForTest() {
         List<QuotaBalanceVO> balances = new ArrayList<>();
 

Original file line number	Diff line number	Diff line change
`@@ -893,7 +893,6 @@ public void injectUsageTypeVariablesTestReturnInjectedVariables() {`
`893`	`893`	`Assert.assertTrue(formattedVariables.containsValue("zonename"));`
`894`	`894`	`}`
`895`	`895`
`896`		`-<<<<<<< HEAD`
`897`	`896`	`private List<QuotaBalanceVO> getQuotaBalancesForTest() {`
`898`	`897`	`List<QuotaBalanceVO> balances = new ArrayList<>();`
`899`	`898`