diff options
| author | Daniel Chen | 2018-02-06 15:51:20 -0500 |
|---|---|---|
| committer | Daniel Chen | 2018-02-06 15:51:20 -0500 |
| commit | d4b26b084e6dede31f18a8fb82b8deff3dd7815e (patch) | |
| tree | 6f7447f44c7ca21a7e51ac8016b03b2a7c558405 /LICENSE | |
| parent | 77a4813794f58cdf9a2d3dc9296fcd89be5139ab (diff) | |
| parent | 6959e65795ee61ba210b7944c52a655def3e9747 (diff) | |
| download | aur-d4b26b084e6dede31f18a8fb82b8deff3dd7815e.tar.gz | |
fix conflicts
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met: this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -* Neither the name of transformime-react nor the names of its +* Neither the name of nteract nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -25,3 +25,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + |