Skip to content

Commit eea1665

Browse files
DAMMAKDAMMAK
committed
merged
2 parents 9c64e15 + 58f6034 commit eea1665

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66
## 1.0.0 (29-09-2020)
77

88
- Minor updates to the documentation
9+
<<<<<<< HEAD
910

1011
## 1.0.1 (29-09-2020)
1112

1213
- Fix code error
1314
- Include Example source code
15+
=======
16+
>>>>>>> 58f6034d57e2902e6c84afa6406161ba8366cb5f

0 commit comments

Comments
 (0)