Skip to content

Commit

Permalink
Fix a merge conflict on the LICENSE.
Browse files Browse the repository at this point in the history
  • Loading branch information
Zed A. Shaw committed Jun 8, 2015
2 parents eb4a915 + decf6e4 commit 9021770
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
SOFTWARE.

------
=======

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
Expand Down

0 comments on commit 9021770

Please sign in to comment.