Merge remote-tracking branch 'origin/master'
# Conflicts: # pom.xml
This commit is contained in:
commit
c3cf0517cd
4
pom.xml
4
pom.xml
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>net.mingsoft</groupId>
|
||||
<artifactId>mcms</artifactId>
|
||||
<artifactId>wb-mcms</artifactId>
|
||||
<version>4.7.1</version>
|
||||
<name>ms-mcms</name>
|
||||
<properties>
|
||||
|
|
Loading…
Reference in New Issue