From 728d093ee377134b8f012dd9d776a70fb5a1e5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Skaaden?= Date: Sun, 16 Aug 2020 14:53:54 +0200 Subject: [PATCH 1/2] Update index --- index.md | 129 +++++-------------------------------------------------- 1 file changed, 10 insertions(+), 119 deletions(-) diff --git a/index.md b/index.md index 8611051..fdd9f13 100644 --- a/index.md +++ b/index.md @@ -1,123 +1,14 @@ --- layout: default --- +Prosjekter, dokumenter og annet +------------------------------- +* [NTNU prosjekter og filer](./files/ntnu/) +* [Lydrelaterte dokumenter og filer](./files/sound/) -Text can be **bold**, _italic_, or ~~strikethrough~~. - -[Link to another page](./another-page.html). - -There should be whitespace between paragraphs. - -There should be whitespace between paragraphs. We recommend including a README, or a file with information about your project. - -# Header 1 - -This is a normal paragraph following a header. GitHub is a code hosting platform for version control and collaboration. It lets you and others work together on projects from anywhere. - -## Header 2 - -> This is a blockquote following a header. -> -> When something is important enough, you do it even if the odds are not in your favor. - -### Header 3 - -```js -// Javascript code with syntax highlighting. -var fun = function lang(l) { - dateformat.i18n = require('./lang/' + l) - return true; -} -``` - -```ruby -# Ruby code with syntax highlighting -GitHubPages::Dependencies.gems.each do |gem, version| - s.add_dependency(gem, "= #{version}") -end -``` - -#### Header 4 - -* This is an unordered list following a header. -* This is an unordered list following a header. -* This is an unordered list following a header. - -##### Header 5 - -1. This is an ordered list following a header. -2. This is an ordered list following a header. -3. This is an ordered list following a header. - -###### Header 6 - -| head1 | head two | three | -|:-------------|:------------------|:------| -| ok | good swedish fish | nice | -| out of stock | good and plenty | nice | -| ok | good `oreos` | hmm | -| ok | good `zoute` drop | yumm | - -### There's a horizontal rule below this. - -* * * - -### Here is an unordered list: - -* Item foo -* Item bar -* Item baz -* Item zip - -### And an ordered list: - -1. Item one -1. Item two -1. Item three -1. Item four - -### And a nested list: - -- level 1 item - - level 2 item - - level 2 item - - level 3 item - - level 3 item -- level 1 item - - level 2 item - - level 2 item - - level 2 item -- level 1 item - - level 2 item - - level 2 item -- level 1 item - -### Small image - -![Octocat](https://github.githubassets.com/images/icons/emoji/octocat.png) - -### Large image - -![Branching](https://guides.github.com/activities/hello-world/branching.png) - - -### Definition lists can be used with HTML syntax. - -
-
Name
-
Godzilla
-
Born
-
1952
-
Birthplace
-
Japan
-
Color
-
Green
-
- -``` -Long, single-line code blocks should not wrap. They should horizontally scroll if they are too long. This line should be long enough to demonstrate this. -``` - -``` -The final element. -``` +Andre tjenester på *GLaDOS* +--------------------------- +* [Text 2 Mindmap](https://t2m.glados.no) + - Nettside for å lage tankekart ut ifra vanlige tekstfiler +* [Git](https://git.glados.no) + - Git-server for større prosjekter \ No newline at end of file -- 2.25.1 From 4753ad4bdd9688ed7aa13bc3bc9ed36dd94771b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Skaaden?= Date: Sun, 16 Aug 2020 15:06:05 +0200 Subject: [PATCH 2/2] Testing --- index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.md b/index.md index 0e81cc5..a625828 100644 --- a/index.md +++ b/index.md @@ -1,7 +1,8 @@ --- layout: default --- -<<<<<<< HEAD +Testing + Prosjekter, dokumenter og annet ------------------------------- * [NTNU prosjekter og filer](./files/ntnu/) -- 2.25.1