diff --git a/LICENSE b/LICENSE index ee8855c..7308170 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2019 scaleflex +Copyright (c) 2022 SCALEFLEX SAS Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -19,3 +19,15 @@ 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. + +--------------------------------------------------------------------------------- + +Publicity + +You agree that Scaleflex may reference and use Your name, logos and trademarks in Scaleflex +marketing and promotional materials, including, but not limited to the Scaleflex Websites, solely for +purposes of identifying You as a customer of Scaleflex. Otherwise, neither party may use the trade +names, trademarks, service marks, or logos of the other party without the express written consent of +the other party. + + diff --git a/README.md b/README.md index 0888d87..f016da2 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](https://twitter.com/intent/tweet?text=Engage%20your%20customers%20with%20a%20stunning%20360%20viewvof%20your%20products&url=https://scaleflex.github.io/js-cloudimage-360-view/&via=cloudimage&hashtags=images,cloudimage)
+<<<<<<< HEAD +======= + + +>>>>>>> 58b1339b0d3b4d55b40e37d6a327c345ca15e1cd