Merge branch 'master' of https://gitea.prod.resk-u.ch/CLERC/Reskreen

2024-07-14 17:05:07 +02:00
parent 96d4962ade a286e0eaa8
commit c88d938478
1 changed files with 4 additions and 0 deletions
--- a/studenteval/templates/studenteval/all_pdf_template.html
+++ b/studenteval/templates/studenteval/all_pdf_template.html
@@ -9,7 +9,11 @@
                }
                @frame footer_frame {           /* Another static Frame */
                    -pdf-frame-content: footer_content;
+<<<<<<< HEAD
                    left: 50pt;  top: 20pt; height: 20pt;
+=======
+                    left: 50pt;  bottom: 20pt; height: 20pt;
+>>>>>>> a286e0eaa8c391c4786993d1954e3028466c782a
                }
            }