Merge branch 'master' into sajid-as_500

# Conflicts: # projects/trails/trails.cabal
data61 · Jul 22, 2019 · 9407ca1 · 9407ca1
2 parents 244f136 + 7840280
commit 9407ca1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/projects/trails/trails.cabal b/projects/trails/trails.cabal
@@ -13,7 +13,7 @@ homepage:       https://github.com/data61/Mirza
 bug-reports:    https://github.com/data61/Mirza/issues
 author:         Paul Samways
 maintainer:     [email protected]
-copyright:      2017, 2018, 2019 CSIRO
+copyright:      2017 CSIRO
 license:        Apache-2.0
 license-file:   LICENSE
 build-type:     Simple