Skip to content

Commit

Permalink
Merge branch 'master' of github.com:slimgroup/SetIntersectionProjecti…
Browse files Browse the repository at this point in the history
…on.jl
  • Loading branch information
PetersBas committed May 15, 2020
2 parents 767a819 + 94706e9 commit 7fa2e62
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions LICENSE.md → LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) [2019] [Bas Peters]
Copyright (c) 2018 SLIM group @ The University of British Columbia

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.

0 comments on commit 7fa2e62

Please sign in to comment.