From 5d398be5ad5504adfff2a458e9cb03f2bb3b3095 Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <thorsten.glaser@teckids.org>
Date: Sun, 17 Jul 2016 01:26:30 +0200
Subject: [PATCH] [verein.git] make it possible to merge with master w/o
 conflicts

---
 teckids.sty | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/teckids.sty b/teckids.sty
index c728378..57652d2 100644
--- a/teckids.sty
+++ b/teckids.sty
@@ -285,12 +285,14 @@
 \newunicodechar{☌}{\conjunction}
 \newunicodechar{☍}{\opposition}
 
+\newunicodechar{‑}{-\nolinebreak\hspace{0pt}}
 % em dash
 \def\dash{\unskip\kern.16667em\textemdash\penalty\exhyphenpenalty\hskip.16667em\relax}
 % for footnotes
 \newcommand{\Hair}{\kern.16667em}
 
 \newcommand{\ankreuzen}{Bitte zum Beispiel so → \CheckedBox\hspace{0.05cm} ← ankreuzen!}
+\newcommand{\angekreuzteskaestchen}{\CheckedBox\hspace{0.1cm}}
 \newcommand{\ankreuzkaestchen}{\Square\hspace{0.1cm}}
 
 \newcommand{\keineseitenzahlenbeginn}{%
-- 
GitLab