Fix a merge conflict on the LICENSE.
This commit is contained in:
commit
90217701b9
2
LICENSE
2
LICENSE
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue