diff options
| author |   Alessandro Iezzi <aiezzi@alessandroiezzi.it> | 2021-04-06 22:41:23 +0200 |
|---|---|---|
| committer | Alessandro Iezzi <aiezzi@alessandroiezzi.it> | 2021-04-06 22:41:23 +0200 |
| commit | e6414b63a56deae90928808f9d0a6c9e2364b63d (patch) | |
| tree | 836e158bf153723837a783939a0f9c104a59d7f9 /pom.xml | |
| parent | e478df9b43333aab3c730aeee79fe1448305ae3c (diff) | |
| parent | 0b53187ef9ed8a27427c8a303a97744f8f02e81c (diff) | |
| download | hyde-e6414b63a56deae90928808f9d0a6c9e2364b63d.tar.gz hyde-e6414b63a56deae90928808f9d0a6c9e2364b63d.zip | |
Resolve conflicts
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -1,16 +1,17 @@ <?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"> +<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>it.alessandroiezzi</groupId> - <artifactId>genwebsite</artifactId> + <artifactId>hyde</artifactId> <version>0.0.1</version> - <name>genwebsite</name> + <name>hyde</name> <!-- FIXME change it to the project's website --> - <url>http://www.example.com</url> + <url>https://github.com/aindros/hyde</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |