resolve merge conflicts

2018-12-28 14:46:55 -08:00
parent 9deb9890e7 16e6f36116
commit 2eae9f2bb2
29 changed files with 1038 additions and 19 deletions
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2017 Kevin Marquette
+Copyright (c) 2019 Kevin Marquette

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal