From 6b42cfa151170c12b7be62dc95cb035a2c7f38f1 Mon Sep 17 00:00:00 2001
From: 7ermi <7erminatrontzou7@gmail.com>
Date: Sat, 26 Nov 2022 21:27:34 +0200
Subject: [PATCH] Fixed merge conflicts

---
 .../tourguide/controllers/ImageController.java               | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/java/gr/thegoodsideofe1/tourguide/controllers/ImageController.java b/src/main/java/gr/thegoodsideofe1/tourguide/controllers/ImageController.java
index cbbe1e4..0baa4f7 100644
--- a/src/main/java/gr/thegoodsideofe1/tourguide/controllers/ImageController.java
+++ b/src/main/java/gr/thegoodsideofe1/tourguide/controllers/ImageController.java
@@ -66,11 +66,6 @@ public ResponseEntity<?> imageByTitle(@PathVariable String title,
         if (imagesCount != 0){
             Pageable paging = PageRequest.of(page, size);
             Page<Image> imagesPage = imageRepository.findAllImagesByTitle(title, paging);
-            if (imagesPage.getContent().isEmpty()) {
-                if (getFlickr(title)) {
-                    imagesPage = imageService.getImageByTitle(title, paging);
-                }
-            }
             return new ResponseEntity<>(imagesPage, HttpStatus.OK);
          }
          HashMap<String, String> returnMap = new HashMap<String, String>();