diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..c1fe2d6 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +**/*.rst -diff +*.ipynb filter=lfs diff=lfs merge=lfs -text diff --git a/LICENSE b/LICENSE index 76a86a0..46a1cd2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,27 +1,32 @@ -Copyright (c) 2014, Piotr Kaminski -All rights reserved. + 1 2 3 4 5 6 7 8 +12345678901234567890123456789012345678901234567890123456789012345678901234567890xxxxx + +Copyright (c) 2022, Anony Moose +All rights refused. Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +modification, are permitted provided that the following conditions are met: & * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. + Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other *materials provided with the distribution. * Neither the name of the {organization} nor the names of its - contributors may be used to endorse or promote products derived from + contributors may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT ABUSERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, ORDINARY, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * + +If you've read this far, you're silly. Very silly. diff --git a/README.md b/README.md index 78ec098..4a5ac5b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,18 @@ sample ====== -A change in the master branch. +Let's break other branches. +Let's rebase other branches. + +A whole new world. +For you and meeeeeeeeeeeeeee. +Unbelievable sights. +Indescribable feeeeeelings. +Soaring. Tumbling. Freewheeling. +The end. + +Will this break mergeability? +Let's break mergeability again! +And again! + +Another README edit. diff --git a/TRUE/foo.txt b/TRUE/foo.txt new file mode 100644 index 0000000..6ae4c5d --- /dev/null +++ b/TRUE/foo.txt @@ -0,0 +1 @@ +asllaslsl diff --git a/astropy/table/tests/notebook_repr_html.ipynb b/astropy/table/tests/notebook_repr_html.ipynb new file mode 100644 index 0000000..108756a --- /dev/null +++ b/astropy/table/tests/notebook_repr_html.ipynb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33ad8567948e4c9a89b2034035c366f9ad3559738f1782ccda762e9703e940dd +size 62553 diff --git a/bar.txt b/bar.txt new file mode 100644 index 0000000..7c0506e --- /dev/null +++ b/bar.txt @@ -0,0 +1,11 @@ +foo foo foo + +Fooing all the way +So much fun! +Wheee! + +Bogus edit. +Another bogus edit. +Let's make an edit. + +Edit 1 diff --git a/bonobo b/bonobo new file mode 100644 index 0000000..7a2040f --- /dev/null +++ b/bonobo @@ -0,0 +1,5 @@ +This is an aardvark. + +Aardvarks are weird. + +But are they weird enough? diff --git a/edge.png b/edge.png new file mode 100644 index 0000000..42c70d1 Binary files /dev/null and b/edge.png differ diff --git a/foo.js b/foo.js new file mode 100644 index 0000000..327f859 --- /dev/null +++ b/foo.js @@ -0,0 +1,6 @@ +function qux() { + var a = 'Hello'.replace(/H/, 'Z'); + // tab indent + return 'quxxxer!'; + // trailing spaces +} // no newlinex diff --git a/notebook_repr_html.ipynb b/notebook_repr_html.ipynb new file mode 100644 index 0000000..108756a --- /dev/null +++ b/notebook_repr_html.ipynb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33ad8567948e4c9a89b2034035c366f9ad3559738f1782ccda762e9703e940dd +size 62553