Conflicts resolved

This commit is contained in:
Student Politechniki
2025-10-14 13:28:27 +02:00
2 changed files with 15 additions and 2 deletions

View File

@@ -7,9 +7,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
public class DemoApplication {
public static void main(String[] args) {
System.out.println("Start application");
System.out.println("Start application 3");
SpringApplication.run(DemoApplication.class, args);
System.out.println("Start application");
System.out.println("Start application 2");
}
}

View File

@@ -0,0 +1,13 @@
/*
* Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
*/
package com.example.demo.controller;
/**
*
* @author student
*/
public class UserController {
}