Merge branch 'Phuoc' of https://github.com/TheFutureLegends/Movie-Boo…

…king-System into Phuoc

.gitignore

@@ -32,4 +32,7 @@ build/
 ### VS Code ###
 .vscode/
 
-/src/main/resources/application.properties/
+/src/main/resources/application.properties/
+.settings/org.eclipse.core.resources.prefs
+.settings/org.eclipse.jdt.apt.core.prefs
+.vscode/launch.json

.gitignore.orig

@@ -0,0 +1,44 @@
+HELP.md
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
+
+<<<<<<< HEAD
+/src/main/resources/application.properties/
+=======
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+/target/
+.settings/org.eclipse.core.resources.prefs
+.settings/org.eclipse.jdt.apt.core.prefs
+.vscode/launch.json
+>>>>>>> develop

README.md.orig

@@ -0,0 +1,7 @@
+<<<<<<< HEAD
+Change to trigger CI/CD.
+Change one more
+=======
+# SECONDARY MAIN BRANCH
+This branch diverges from the MASTER branch and act as the main branch for development.
+>>>>>>> develop