pkaminski · pkaminski · Jul 1, 2014 · Jul 1, 2014 · Jul 5, 2014 · Jul 5, 2014
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+**/*.rst -diff
+*.ipynb filter=lfs diff=lfs merge=lfs -text
diff --git 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<foo>
   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
@@ -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
@@ -0,0 +1 @@
+asllaslsl
diff --git a/astropy/table/tests/notebook_repr_html.ipynb b/astropy/table/tests/notebook_repr_html.ipynb
diff --git a/bar.txt 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
@@ -0,0 +1,5 @@
+This is an aardvark.
+
+Aardvarks are weird.
+
+But are they weird enough?
diff --git a/edge.png b/edge.png
diff --git a/foo.js 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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		*/.rst -diff
		*.ipynb filter=lfs diff=lfs merge=lfs -text