From 3b0a5b57355b48f2fb80caccb7bc129386ae5829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lilian=20J=C3=B3nsd=C3=B3ttir?= Date: Sat, 11 Jul 2020 14:42:23 -0700 Subject: [PATCH] wtf git --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index e5209d8..1244d39 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,7 @@ i.e. Turkish FGĞIOD, Latvian ĄŽERTY Don't put erroneous data into keys.lua. This mod works by overwriting the data at the memory address that Morrowind reads output text from. Changing the length of the tables could overwrite things you don't want overwritten. -<<<<<<< HEAD -As of 1.1, changing the length of the tables shouldn't be possible, but as always, garbage in garbage out. -======= As of [33208a9](https://github.com/celediel/Morrowind-Keyboard-Layout-Changer/commit/33208a900d72fa27d08d9d14b08679585d44b4c4), changing the length of the tables shouldn't be possible, but as always, garbage in garbage out. ->>>>>>> master ## Requirements ## MWSE 2.1 nightly @ [github](https://github.com/MWSE/MWSE)