Skip to content

Commit b21d0d7

Browse files
committed
chore(pkg): Fixing merge conflict
1 parent a4f37a7 commit b21d0d7

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# How to Contribute
22

33
This project is part of Hephy. You can find the latest contribution
4-
guidelines [at the Deis project](https://github.com/teamhephy/deis/blob/master/CONTRIBUTING.md).
4+
guidelines [at the Hephy project](https://github.com/teamhephy/deis/blob/master/CONTRIBUTING.md).
55

MAINTAINERS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Deis Maintainers
1+
# Hephy Maintainers
22

33
This project is part of Hephy. The official maintainers documentation is
44
located [in the main project](https://github.com/teamhephy/deis/blob/master/MAINTAINERS.md).

0 commit comments

Comments
 (0)