aboutsummaryrefslogtreecommitdiffstats
path: root/readme.md
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2020-08-28 10:08:59 -0700
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2020-08-29 14:30:02 -0700
commitd3721bdff9cc5e0df0323d97b3f37dd57c208c36 (patch)
tree0c4b582991453d4299601a6c9650e519fb79a060 /readme.md
parentc56b9a1ce97e415b90a0e8d32d84f7799c84bed5 (diff)
downloadfirmware-d3721bdff9cc5e0df0323d97b3f37dd57c208c36.tar.gz
firmware-d3721bdff9cc5e0df0323d97b3f37dd57c208c36.tar.bz2
firmware-d3721bdff9cc5e0df0323d97b3f37dd57c208c36.zip
Revert "Branch point for 2020 Aug 29 Breaking Change"
This reverts commit 7259126e8d67e83a9bd48dcf0914be1849d638b5.
Diffstat (limited to 'readme.md')
-rw-r--r--readme.md6
1 files changed, 0 insertions, 6 deletions
diff --git a/readme.md b/readme.md
index 6321681a9..6092f209b 100644
--- a/readme.md
+++ b/readme.md
@@ -7,12 +7,6 @@
[![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly)
[![GitHub forks](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)
-# THIS IS THE DEVELOP BRANCH
-
-Warning- This is the `develop` branch of QMK Firmware. You may encounter broken code here. Please see [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) for more information.
-
-# Original readme continues
-
This is a keyboard firmware based on the [tmk\_keyboard firmware](https://github.com/tmk/tmk_keyboard) with some useful features for Atmel AVR and ARM controllers, and more specifically, the [OLKB product line](https://olkb.com), the [ErgoDox EZ](https://ergodox-ez.com) keyboard, and the [Clueboard product line](https://clueboard.co).
## Documentation