Skip to content

bugzilla
bugzilla
Commit dd0a538e authored by System Administrator's avatar System Administrator
Browse files
Options

[etersoft] Cherry-pick ad36ea0d

parent e2bb47dd
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
template/en/default/etersoft/timersplash.html.tmpl
View file @ dd0a538e
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script>
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
...@@ -63,3 +64,6 @@ ...@@ -63,3 +64,6 @@
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?09_11_2020_"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?09_11_2020_"></script>
>>>>>>> 6bfa6abbe (Update scripts version) >>>>>>> 6bfa6abbe (Update scripts version)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?09_11_2020"></script>
>>>>>>> ad36ea0d5 (Update scripts version)
template/ru/default/etersoft/timersplash.html.tmpl
View file @ dd0a538e
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?23_04_2021"></script>
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?22_04_2021"></script>
...@@ -63,3 +64,6 @@ ...@@ -63,3 +64,6 @@
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?09_11_2020_"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?09_11_2020_"></script>
>>>>>>> 6bfa6abbe (Update scripts version) >>>>>>> 6bfa6abbe (Update scripts version)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?09_11_2020"></script>
>>>>>>> ad36ea0d5 (Update scripts version)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment