Fix a merge conflict on the LICENSE.

This commit is contained in:
Zed A. Shaw 2015-06-07 18:36:47 -07:00
commit 90217701b9
1 changed files with 1 additions and 1 deletions

View File

@ -22,7 +22,7 @@ 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 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
------ =======
Everything else, including lecture slides, and anything used in the videos or Everything else, including lecture slides, and anything used in the videos or
book are fully copyright by Zed A. Shaw and are not free to use without book are fully copyright by Zed A. Shaw and are not free to use without