Index: src/main/java/com/example/moviezone/config/WebSecurityConfig.java
===================================================================
--- src/main/java/com/example/moviezone/config/WebSecurityConfig.java	(revision f2141981e5a70e1c63c8f58377d0d4423e0a16ac)
+++ src/main/java/com/example/moviezone/config/WebSecurityConfig.java	(revision 1fcb086a26f7732e342b5a460df7bfa6c1ef5d07)
@@ -32,9 +32,6 @@
         http.csrf().disable()
                 .authorizeRequests()
-<<<<<<< Updated upstream
                 .antMatchers("/","/films","/home/projections","/home/events","/home/getProjections/**","/home/films","/home/getFilm/**","/getFilm/**","/home/getEvent/**","/getEvent/**","/login","/events","/projections" ,"/home", "/assets/**", "/register", "/registerWorker","/api/**").permitAll()
-=======
                 .antMatchers("/","/finishRegister","/registerWorker","/films","/home/projections","/home/events","/home/getProjections/**","/home/films","/home/getFilm/**","/getFilm/**","/home/getEvent/**","/getEvent/**","redirect:/login","/login","/events","/projections" ,"/home", "/assets/**", "/register", "/api/**").permitAll()
->>>>>>> Stashed changes
                 .antMatchers("/home/getSeats/**","/myTickets","/home/addInterestedEvent/**","/home/deleteInterestedEvent/**","/home/addRating/**","/addRating/**","/getProjection/**","/home/makeReservation","/profileUser").hasRole("USER")
                 .antMatchers("/**").hasRole("ADMIN")