Resolved conflict

This commit is contained in:
Mykola Derevianko 2025-10-03 11:18:18 +02:00
commit 21f6b2402a
2 changed files with 15 additions and 1 deletions

View File

@ -8,7 +8,8 @@ public class BasicApplication {
public static void main(String[] args) { public static void main(String[] args) {
System.out.println("Start application"); System.out.println("Start application");
System.out.println("Start application develop_2"); System.out.println("Start application2");
SpringApplication.run(BasicApplication.class, args); SpringApplication.run(BasicApplication.class, args);
} }

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.controller;
/**
*
* @author student
*/
public class UserController {
}