From f8e2ed0eca64918c8ff60ae88bf9a3ade86000cf Mon Sep 17 00:00:00 2001 From: u-n-known <60901726+u-n-known@users.noreply.github.com> Date: Fri, 14 Feb 2020 00:41:09 +0100 Subject: [PATCH 1/2] Either quotation marks or italicization Highlighting twice is unnecessary. --- 1-js/01-getting-started/1-intro/article.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1-js/01-getting-started/1-intro/article.md b/1-js/01-getting-started/1-intro/article.md index cebdaf01c..30d08f05d 100644 --- a/1-js/01-getting-started/1-intro/article.md +++ b/1-js/01-getting-started/1-intro/article.md @@ -4,7 +4,7 @@ Let's see what's so special about JavaScript, what we can achieve with it, and w ## What is JavaScript? -*JavaScript* was initially created to *"make web pages alive"*. +*JavaScript* was initially created to "make web pages alive". The programs in this language are called *scripts*. They can be written right in a web page's HTML and run automatically as the page loads. From 113f15e32e931513a3fad50c67dca92a57923cee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Heged=C3=BCs?= Date: Mon, 20 Apr 2020 22:30:45 +0200 Subject: [PATCH 2/2] Update article.md --- 1-js/01-getting-started/1-intro/article.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/1-js/01-getting-started/1-intro/article.md b/1-js/01-getting-started/1-intro/article.md index 05e644cdd..591a4c831 100644 --- a/1-js/01-getting-started/1-intro/article.md +++ b/1-js/01-getting-started/1-intro/article.md @@ -4,11 +4,7 @@ Mal sehen, was das Besondere an JavaScript ist, was wir damit erreichen können ## Was ist JavaScript? -<<<<<<< HEAD *JavaScript* wurde ursprünglich entwickelt, um *"Webseiten lebendig zu machen "*. -======= -*JavaScript* was initially created to "make web pages alive". ->>>>>>> c89ddc5d92195e08e2c32e30526fdb755fec4622 Die Programme dieser Sprache werden *scripts* genannt. Sie können direkt im HTML der Seite geschrieben werden und werden automatisch beim laden der Seite ausgeführt.