Skip to content

Commit 453a917

Browse files
jeremyleujeremyleu
committed
fix merge conflicts
2 parents f985b3a + bf0466a commit 453a917

File tree

8 files changed

+132
-35077
lines changed

8 files changed

+132
-35077
lines changed

‎.travis.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎CONTRIBUTING.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
The MIT License (MIT)
22

33
Copyright (c) 2015 Next Step Webs, Inc.
4+
Copyright (c) 2017 Clockwork IT GmbH
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy
67
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)