git rebase

Author: k-olya

LICENSE

@@ -1,10 +1,6 @@
 MIT License
 
-<<<<<<< HEAD
-Copyright (c) 2019 Chris Pearson
-=======
 Copyright (c) 2019 kparc
->>>>>>> added license
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,32 +1,3 @@
-<<<<<<< HEAD
-# k reference card
-
-https://kparc.github.io/ref
-
-An unofficial clickable version of the k help, accessible in the REPL with `\h`.
-
-It provides examples, short recipes, dev progress notes, and links to other resources.
-
-Trial versions of k for macOS and Linux can be downloaded from Anaconda - follow the instructions [here](https://github.com/kparc/kcc/blob/master/README.md#get).
-
-To add a section:
-
-1. Select a word that you'd like to contribute docs for in the quickref
-2. Add it to the `links` array in `index.html`
-3. Search for the string 'template' in `index.html`, and copy it. Add the word as an id to the `h2` or `h3` or `h4` and fill in content beneath it.
-
-Edit the docs by editing `index.html`.
-
-TODO:
-
-* Write more docs
-* Convert to markdown, implement code validation vs. latest release
-* Figure out how to sync `index.html` with changes to the quickref (may need Shakti's help)
-* Tempted to switch to [MkDocs/Material](https://squidfunk.github.io/mkdocs-material/), but want to keep it simple for now
-* Consider [Zig's docs approach](https://ziglang.org/documentation/master/#Introduction) - easily downloaded single file + code samples form part of the test suite
-* Get a better system for dynamically adding links, that can handle a word appearing more than once in the help (eg maybe subsequent mentions become '#list2')
-* Consider moving 'contribute' link to right-hand side of banner (just be wary of impact on small mobile phone screens)
-=======
 ## Yet another take on the refcard
 
 ### Features
@@ -54,10 +25,5 @@ and serve the `./build/` directory over http
 * merge with updated content
 * plug in test script
 * create a build hook
-<<<<<<< HEAD
-
->>>>>>> initial commit
-=======
 * add some fancy `<meta>` tags like `name` and `description`
 * learn [pug](https://naltatis.github.io/jade-syntax-docs/), aka jade, it will take you ~30 minutes, if you want to modify html
->>>>>>> updated README