fix merge conflicts

leetcode · Jun 19, 2018 · 453a917 · 453a917
2 parents f985b3a + bf0466a
commit 453a917
Show file tree

Hide file tree

Showing 8 changed files with 132 additions and 35,077 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2015 Next Step Webs, Inc.
+Copyright (c) 2017 Clockwork IT GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal