summaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2018-08-26 01:38:36 +0200
committerGitHub <noreply@github.com>2018-08-26 01:38:36 +0200
commite96169810d2c973f7ce6c58b1677591f3f118f53 (patch)
treef4f3c143c9bb2244fb9389ae1bfb1499adf5d2f0 /README.md
parent868b22599a49c27d486d59531e8ac66d9b8d2298 (diff)
Fix merge
Diffstat (limited to 'README.md')
-rw-r--r--README.md2
1 files changed, 0 insertions, 2 deletions
diff --git a/README.md b/README.md
index 9f5fd5fe..61840997 100644
--- a/README.md
+++ b/README.md
@@ -71,8 +71,6 @@ or for integration tests:
phpunit -c phpunit.integration.xml
-for integration tests.
-
## :v: Code of conduct