Home Explore Help
Register Sign In
2207190438
/
homework
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Resolve merge conflict

joshhart9 1 year ago
parent
ddb1308db5 283cd46cd9
commit
941ee1f6d6
6 changed files with 74 additions and 1 deletions
Split View Show Diff Stats
  1. 38 0
      .gitignore
  2. 7 0
      .idea/.gitignore
  3. 7 0
      .idea/misc.xml
  4. 2 0
      README.md
  5. 11 0
      pom.xml
  6. 9 1
      src/main/webapp/index.jsp

+ 38 - 0
.gitignore
View File 

@@ -0,0 +1,38 @@
 
+target/
 
+!.mvn/wrapper/maven-wrapper.jar
 
+!**/src/main/**/target/
 
+!**/src/test/**/target/
 
+
 
+### IntelliJ IDEA ###
 
+.idea/modules.xml
 
+.idea/jarRepositories.xml
 
+.idea/compiler.xml
 
+.idea/libraries/
 
+*.iws
 
+*.iml
 
+*.ipr
 
+
 
+### Eclipse ###
 
+.apt_generated
 
+.classpath
 
+.factorypath
 
+.project
 
+.settings
 
+.springBeans
 
+.sts4-cache
 
+
 
+### NetBeans ###
 
+/nbproject/private/
 
+/nbbuild/
 
+/dist/
 
+/nbdist/
 
+/.nb-gradle/
 
+build/
 
+!**/src/main/**/build/
 
+!**/src/test/**/build/
 
+
 
+### VS Code ###
 
+.vscode/
 
+
 
+### Mac OS ###
 
+.DS_Store

+ 7 - 0
.idea/.gitignore
View File 

@@ -1,7 +1,14 @@
 
+<<<<<<< HEAD
 
 # Default ignored files
 
 /shelf/
 
 /workspace.xml
 
 # Editor-based HTTP Client requests
 
+=======
 
+# 默认忽略的文件
 
+/shelf/
 
+/workspace.xml
 
+# 基于编辑器的 HTTP 客户端请求
 
+>>>>>>> 283cd46cd97ae534457edc887c2a675e2dc2eb8c
 
 /httpRequests/
 
 # Datasource local storage ignored files
 
 /dataSources/

+ 7 - 0
.idea/misc.xml
View File 

@@ -1,9 +1,12 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project version="4">
 
   <component name="ExternalStorageConfigurationManager" enabled="true" />
 
+<<<<<<< HEAD
 
   <component name="FrameworkDetectionExcludesConfiguration">
 
     <file type="web" url="file://$PROJECT_DIR$" />
 
   </component>
 
+=======
 
+>>>>>>> 283cd46cd97ae534457edc887c2a675e2dc2eb8c
 
   <component name="MavenProjectsManager">
 
     <option name="originalFiles">
 
       <list>
 
@@ -11,7 +14,11 @@
 
       </list>
 
     </option>
 
   </component>
 
+<<<<<<< HEAD
 
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8 (2)" project-jdk-type="JavaSDK">
 
+=======
 
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="openjdk-21 (2)" project-jdk-type="JavaSDK">
 
+>>>>>>> 283cd46cd97ae534457edc887c2a675e2dc2eb8c
 
     <output url="file://$PROJECT_DIR$/out" />
 
   </component>
 
 </project>

+ 2 - 0
README.md
View File 

@@ -0,0 +1,2 @@
 
+# homework
 
+

+ 11 - 0
pom.xml
View File 

@@ -2,10 +2,17 @@
 
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.example</groupId>
 
+<<<<<<< HEAD
 
   <artifactId>untitled</artifactId>
 
   <packaging>war</packaging>
 
   <version>1.0-SNAPSHOT</version>
 
   <name>untitled Maven Webapp</name>
 
+=======
 
+  <artifactId>test4</artifactId>
 
+  <packaging>war</packaging>
 
+  <version>1.0-SNAPSHOT</version>
 
+  <name>test4 Maven Webapp</name>
 
+>>>>>>> 283cd46cd97ae534457edc887c2a675e2dc2eb8c
 
   <url>http://maven.apache.org</url>
 
   <dependencies>
 
     <dependency>
 
@@ -16,6 +23,10 @@
 
     </dependency>
 
   </dependencies>
 
   <build>
 
+<<<<<<< HEAD
 
     <finalName>untitled</finalName>
 
+=======
 
+    <finalName>test4</finalName>
 
+>>>>>>> 283cd46cd97ae534457edc887c2a675e2dc2eb8c
 
   </build>
 
 </project>

+ 9 - 1
src/main/webapp/index.jsp
View File 

@@ -1,3 +1,4 @@
 
+<<<<<<< HEAD
 
 <%@ page contentType="text/html; charset=gb2312"%>
 
 <!DOCTYPE html>
 
 <html lang="en">
 
@@ -387,4 +388,11 @@
 
 </script>
 
 </body>
 
 
-</html>
 
+</html>
 
+=======
 
+<html>
 
+<body>
 
+<h2>Hello World!</h2>
 
+</body>
 
+</html>
 
+>>>>>>> 283cd46cd97ae534457edc887c2a675e2dc2eb8c