forked from 99627/DemoApplication
Conflicts resolved
This commit is contained in:
@@ -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");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user