forked from mykola-derevianko/DemoApplication1
Resolved conflict
This commit is contained in:
commit
21f6b2402a
@ -8,7 +8,8 @@ public class BasicApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.out.println("Start application");
|
||||
System.out.println("Start application develop_2");
|
||||
System.out.println("Start application2");
|
||||
|
||||
SpringApplication.run(BasicApplication.class, args);
|
||||
}
|
||||
|
||||
|
13
src/main/java/com/example/controller/UserController.java
Normal file
13
src/main/java/com/example/controller/UserController.java
Normal 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 {
|
||||
|
||||
}
|
Loading…
Reference in New Issue
Block a user