From b8eb8b0a4016232c8da95c26501ac60ea9491901 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 02 Sep 2016 00:26:12 +0000
Subject: [PATCH] Merge branch 'master' of github.com:pjreddie/darknet

---
 LICENSE |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/LICENSE b/LICENSE
index 5b8709a..a50f7d7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,13 +1,12 @@
                                   YOLO LICENSE
-                             Version 1, July 10 2015
+                             Version 2, July 29 2016
 
 THIS SOFTWARE LICENSE IS PROVIDED "ALL CAPS" SO THAT YOU KNOW IT IS SUPER
 SERIOUS AND YOU DON'T MESS AROUND WITH COPYRIGHT LAW BECAUSE YOU WILL GET IN
 TROUBLE HERE ARE SOME OTHER BUZZWORDS COMMONLY IN THESE THINGS WARRANTIES
-LIABILITY CONTRACT TORT LIABLE CLAIMS RESTRICTION MERCHANTABILITY SUBJECT TO
-THE FOLLOWING CONDITIONS:
+LIABILITY CONTRACT TORT LIABLE CLAIMS RESTRICTION MERCHANTABILITY. NOW HERE'S
+THE REAL LICENSE:
 
-1. #yolo
-2. #swag
-3. #blazeit
-
+0. Darknet is public domain.
+1. Do whatever you want with it.
+2. Stop emailing me about it!

--
Gitblit v1.10.0