ci: Remove conflict introduced for test (#29666)
This commit is contained in:
parent
acddbc1920
commit
148c958db8
|
|
@ -3,14 +3,12 @@ package com.appsmith.server.applications.jslibs;
|
||||||
import com.appsmith.server.applications.base.ApplicationService;
|
import com.appsmith.server.applications.base.ApplicationService;
|
||||||
import com.appsmith.server.domains.Application;
|
import com.appsmith.server.domains.Application;
|
||||||
import com.appsmith.server.jslibs.context.ContextBasedJsLibService;
|
import com.appsmith.server.jslibs.context.ContextBasedJsLibService;
|
||||||
import com.appsmith.server.repositories.ApplicationRepository;
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class ApplicationJsLibServiceImpl extends ApplicationJsLibServiceCEImpl
|
public class ApplicationJsLibServiceImpl extends ApplicationJsLibServiceCEImpl
|
||||||
implements ContextBasedJsLibService<Application> {
|
implements ContextBasedJsLibService<Application> {
|
||||||
public ApplicationJsLibServiceImpl(
|
public ApplicationJsLibServiceImpl(ApplicationService applicationService) {
|
||||||
ApplicationService applicationService, ApplicationRepository applicationRepository) {
|
|
||||||
super(applicationService);
|
super(applicationService);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user