Commit 7042cd82 authored by Antoine Guérin's avatar Antoine Guérin
Browse files

tentative de merge

parent 8e705dbe
......@@ -178,6 +178,10 @@ post:
--l'effet voulue a été effectué
----
.Start Game
[plantuml]
----
......
......@@ -7,8 +7,7 @@
"build": "ng build",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"codegen": "node_modules\\.bin\\thrift-typescript.cmd --sourceDir ..\\not-alone-core\\src\\main\\thrift\\ --outDir .\\target\\generated-sources\\thrift\\"
"e2e": "ng e2e"
},
"private": true,
"dependencies": {
......@@ -38,7 +37,8 @@
"jasmine-spec-reporter": "~4.2.1",
"karma": "~3.0.0",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1", "karma-jasmine": "~1.1.2",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"protractor": "~5.4.0",
"ts-node": "~7.0.0",
......
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>not-alone</artifactId>
<groupId>fr.univnantes.alma</groupId>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment