danil.markov ae8ac061bc Merge remote-tracking branch 'origin/feature/parsing-service' into feature/parsing-service ... # Conflicts: # parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/pool/WebDriverPool.java # parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/page/CategoryPage.java # parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/parsing/CategoryPageParsingService.java # parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/parsing/ParsingService.java # parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/scheduler/PartitionScheduler.java		2024-10-14 12:47:34 +04:00
..
.run	merge branches	2024-10-13 19:05:30 +04:00
gradle/wrapper	Feature/parsing-service init project	2024-09-26 21:37:10 +04:00
src	Merge remote-tracking branch 'origin/feature/parsing-service' into feature/parsing-service	2024-10-14 12:47:34 +04:00
.gitignore	Feature/parsing-service init project	2024-09-26 21:37:10 +04:00
build.gradle	merge branches	2024-10-13 19:05:30 +04:00
gradlew	Feature/parsing-service init project	2024-09-26 21:37:10 +04:00
gradlew.bat	Feature/parsing-service init project	2024-09-26 21:37:10 +04:00
settings.gradle	Feature/parsing-service init project	2024-09-26 21:37:10 +04:00