# Conflicts:
#	SkuciSe/src/main/java/com/example/SkuciSe/repository/ZahtevRepository.java
#	SkuciSe/src/main/resources/templates/oglas.html