Fix demo scrolling issue in FF

Remove extraneous merge file Tweak license file so Github recognizes it - still MIT
NickPiscitelli · Nov 16, 2018 · ba743b2 · ba743b2
1 parent ff80542
commit ba743b2
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 5 deletions.
diff --git a/.merge b/.merge
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,7 +1,3 @@
-Released entirely for free under MIT License :)
-
-Copyright 2018 Nick Piscitelli
-
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

diff --git a/docs/assets/css/main.css b/docs/assets/css/main.css
@@ -3870,7 +3870,6 @@ input, select, textarea {
   position:relative;
   overflow-x: auto;
   overflow-y: hidden;
-  overflow: -moz-scrollbars-none;
   -webkit-overflow-scrolling: touch;
   -ms-overflow-style: none;
   }