From a93a19bcfeab93fe5eecb5dacfc526dce6427a97 Mon Sep 17 00:00:00 2001 From: Alyona Date: Tue, 25 Sep 2018 17:13:01 +0400 Subject: [PATCH 1/2] Alyona-Test --- src/main/resources/templates/AlyonaTest.html | 42 ++++++++++++++++++++ src/main/resources/templates/papers.html | 1 + 2 files changed, 43 insertions(+) create mode 100644 src/main/resources/templates/AlyonaTest.html diff --git a/src/main/resources/templates/AlyonaTest.html b/src/main/resources/templates/AlyonaTest.html new file mode 100644 index 0000000..6350a2b --- /dev/null +++ b/src/main/resources/templates/AlyonaTest.html @@ -0,0 +1,42 @@ + + + + + + +
+
+
+
+
+

Тестовая страница

+
+
+
+
+ + + + + + + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/src/main/resources/templates/papers.html b/src/main/resources/templates/papers.html index 81b6952..55e99fb 100644 --- a/src/main/resources/templates/papers.html +++ b/src/main/resources/templates/papers.html @@ -12,6 +12,7 @@

Статьи

+
Перейти на тестовую страницу Алёны
From 08140811870c8a3aca399c957833a1838cea3c27 Mon Sep 17 00:00:00 2001 From: Alyona Date: Wed, 26 Sep 2018 16:11:43 +0400 Subject: [PATCH 2/2] Merge branch 'master' into 23-dashboard # Conflicts: # src/main/resources/templates/papers.html --- src/main/resources/templates/papers.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/resources/templates/papers.html b/src/main/resources/templates/papers.html index d1eb467..92441c7 100644 --- a/src/main/resources/templates/papers.html +++ b/src/main/resources/templates/papers.html @@ -13,11 +13,6 @@

Статьи

Перейти на тестовую страницу Алёны
 -
- -