Browse Source

Fix merge conflict on LICENSE

master
Taylor Bockman 8 years ago
parent
commit
31311ef7b2
  1. 2
      LICENSE

2
LICENSE

@ -19,3 +19,5 @@ 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.

Loading…
Cancel
Save