From e746253bb70e5644c380f8dc44428831b8d6743a Mon Sep 17 00:00:00 2001 From: Daniel Schubert Date: Wed, 6 Mar 2019 09:38:15 +0100 Subject: [PATCH] conflicts --- beispiele/4/remove-spaces.sh | 0 beispiele/5/01-vars.sh | 0 beispiele/5/02-comments.sh | Bin beispiele/5/03-quoting.sh | 0 beispiele/5/04-function-exitcode.sh | 0 beispiele/5/04-function.sh | 0 beispiele/5/05-recursive-func.sh | 0 beispiele/5/07-select-menu.sh | 0 beispiele/5/08-while-menu.sh | 0 beispiele/5/09-backup.sh | 0 beispiele/5/10-whiptail.sh | 0 beispiele/5/aufgabe1.sh | 0 beispiele/5/aufgabe2.sh | 0 deploy.sh | 0 lib/font/league-gothic/league-gothic.eot | Bin lib/font/league-gothic/league-gothic.ttf | Bin lib/font/league-gothic/league-gothic.woff | Bin lib/font/source-sans-pro/source-sans-pro-italic.eot | Bin lib/font/source-sans-pro/source-sans-pro-italic.ttf | Bin .../source-sans-pro/source-sans-pro-italic.woff | Bin .../source-sans-pro/source-sans-pro-regular.eot | Bin .../source-sans-pro/source-sans-pro-regular.ttf | Bin .../source-sans-pro/source-sans-pro-regular.woff | Bin .../source-sans-pro/source-sans-pro-semibold.eot | Bin .../source-sans-pro/source-sans-pro-semibold.ttf | Bin .../source-sans-pro/source-sans-pro-semibold.woff | Bin .../source-sans-pro-semibolditalic.eot | Bin .../source-sans-pro-semibolditalic.ttf | Bin .../source-sans-pro-semibolditalic.woff | Bin plugin/markdown/markdown.js | 0 plugin/math/math.js | 0 31 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 beispiele/4/remove-spaces.sh mode change 100755 => 100644 beispiele/5/01-vars.sh mode change 100755 => 100644 beispiele/5/02-comments.sh mode change 100755 => 100644 beispiele/5/03-quoting.sh mode change 100755 => 100644 beispiele/5/04-function-exitcode.sh mode change 100755 => 100644 beispiele/5/04-function.sh mode change 100755 => 100644 beispiele/5/05-recursive-func.sh mode change 100755 => 100644 beispiele/5/07-select-menu.sh mode change 100755 => 100644 beispiele/5/08-while-menu.sh mode change 100755 => 100644 beispiele/5/09-backup.sh mode change 100755 => 100644 beispiele/5/10-whiptail.sh mode change 100755 => 100644 beispiele/5/aufgabe1.sh mode change 100755 => 100644 beispiele/5/aufgabe2.sh mode change 100755 => 100644 deploy.sh mode change 100755 => 100644 lib/font/league-gothic/league-gothic.eot mode change 100755 => 100644 lib/font/league-gothic/league-gothic.ttf mode change 100755 => 100644 lib/font/league-gothic/league-gothic.woff mode change 100755 => 100644 lib/font/source-sans-pro/source-sans-pro-italic.eot mode change 100755 => 100644 lib/font/source-sans-pro/source-sans-pro-italic.ttf mode change 100755 => 100644 lib/font/source-sans-pro/source-sans-pro-italic.woff mode change 100755 => 100644 lib/font/source-sans-pro/source-sans-pro-regular.eot mode change 100755 => 100644 lib/font/source-sans-pro/source-sans-pro-regular.ttf mode change 100755 => 100644 lib/font/source-sans-pro/source-sans-pro-regular.woff mode change 100755 => 100644 lib/font/source-sans-pro/source-sans-pro-semibold.eot mode change 100755 => 100644 lib/font/source-sans-pro/source-sans-pro-semibold.ttf mode change 100755 => 100644 lib/font/source-sans-pro/source-sans-pro-semibold.woff mode change 100755 => 100644 lib/font/source-sans-pro/source-sans-pro-semibolditalic.eot mode change 100755 => 100644 lib/font/source-sans-pro/source-sans-pro-semibolditalic.ttf mode change 100755 => 100644 lib/font/source-sans-pro/source-sans-pro-semibolditalic.woff mode change 100755 => 100644 plugin/markdown/markdown.js mode change 100755 => 100644 plugin/math/math.js diff --git a/beispiele/4/remove-spaces.sh b/beispiele/4/remove-spaces.sh old mode 100755 new mode 100644 diff --git a/beispiele/5/01-vars.sh b/beispiele/5/01-vars.sh old mode 100755 new mode 100644 diff --git a/beispiele/5/02-comments.sh b/beispiele/5/02-comments.sh old mode 100755 new mode 100644 diff --git a/beispiele/5/03-quoting.sh b/beispiele/5/03-quoting.sh old mode 100755 new mode 100644 diff --git a/beispiele/5/04-function-exitcode.sh b/beispiele/5/04-function-exitcode.sh old mode 100755 new mode 100644 diff --git a/beispiele/5/04-function.sh b/beispiele/5/04-function.sh old mode 100755 new mode 100644 diff --git a/beispiele/5/05-recursive-func.sh b/beispiele/5/05-recursive-func.sh old mode 100755 new mode 100644 diff --git a/beispiele/5/07-select-menu.sh b/beispiele/5/07-select-menu.sh old mode 100755 new mode 100644 diff --git a/beispiele/5/08-while-menu.sh b/beispiele/5/08-while-menu.sh old mode 100755 new mode 100644 diff --git a/beispiele/5/09-backup.sh b/beispiele/5/09-backup.sh old mode 100755 new mode 100644 diff --git a/beispiele/5/10-whiptail.sh b/beispiele/5/10-whiptail.sh old mode 100755 new mode 100644 diff --git a/beispiele/5/aufgabe1.sh b/beispiele/5/aufgabe1.sh old mode 100755 new mode 100644 diff --git a/beispiele/5/aufgabe2.sh b/beispiele/5/aufgabe2.sh old mode 100755 new mode 100644 diff --git a/deploy.sh b/deploy.sh old mode 100755 new mode 100644 diff --git a/lib/font/league-gothic/league-gothic.eot b/lib/font/league-gothic/league-gothic.eot old mode 100755 new mode 100644 diff --git a/lib/font/league-gothic/league-gothic.ttf b/lib/font/league-gothic/league-gothic.ttf old mode 100755 new mode 100644 diff --git a/lib/font/league-gothic/league-gothic.woff b/lib/font/league-gothic/league-gothic.woff old mode 100755 new mode 100644 diff --git a/lib/font/source-sans-pro/source-sans-pro-italic.eot b/lib/font/source-sans-pro/source-sans-pro-italic.eot old mode 100755 new mode 100644 diff --git a/lib/font/source-sans-pro/source-sans-pro-italic.ttf b/lib/font/source-sans-pro/source-sans-pro-italic.ttf old mode 100755 new mode 100644 diff --git a/lib/font/source-sans-pro/source-sans-pro-italic.woff b/lib/font/source-sans-pro/source-sans-pro-italic.woff old mode 100755 new mode 100644 diff --git a/lib/font/source-sans-pro/source-sans-pro-regular.eot b/lib/font/source-sans-pro/source-sans-pro-regular.eot old mode 100755 new mode 100644 diff --git a/lib/font/source-sans-pro/source-sans-pro-regular.ttf b/lib/font/source-sans-pro/source-sans-pro-regular.ttf old mode 100755 new mode 100644 diff --git a/lib/font/source-sans-pro/source-sans-pro-regular.woff b/lib/font/source-sans-pro/source-sans-pro-regular.woff old mode 100755 new mode 100644 diff --git a/lib/font/source-sans-pro/source-sans-pro-semibold.eot b/lib/font/source-sans-pro/source-sans-pro-semibold.eot old mode 100755 new mode 100644 diff --git a/lib/font/source-sans-pro/source-sans-pro-semibold.ttf b/lib/font/source-sans-pro/source-sans-pro-semibold.ttf old mode 100755 new mode 100644 diff --git a/lib/font/source-sans-pro/source-sans-pro-semibold.woff b/lib/font/source-sans-pro/source-sans-pro-semibold.woff old mode 100755 new mode 100644 diff --git a/lib/font/source-sans-pro/source-sans-pro-semibolditalic.eot b/lib/font/source-sans-pro/source-sans-pro-semibolditalic.eot old mode 100755 new mode 100644 diff --git a/lib/font/source-sans-pro/source-sans-pro-semibolditalic.ttf b/lib/font/source-sans-pro/source-sans-pro-semibolditalic.ttf old mode 100755 new mode 100644 diff --git a/lib/font/source-sans-pro/source-sans-pro-semibolditalic.woff b/lib/font/source-sans-pro/source-sans-pro-semibolditalic.woff old mode 100755 new mode 100644 diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js old mode 100755 new mode 100644 diff --git a/plugin/math/math.js b/plugin/math/math.js old mode 100755 new mode 100644