Skip to content

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

[etersoft] Cherry-pick 6bfa6abb

parent 22961ff6
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
template/en/default/etersoft/timersplash.html.tmpl
View file @ 6e17525b
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,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>
...@@ -59,3 +60,6 @@ ...@@ -59,3 +60,6 @@
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?10_11_2020"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?10_11_2020"></script>
>>>>>>> fa750493b (Update scripts version) >>>>>>> fa750493b (Update scripts version)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?09_11_2020_"></script>
>>>>>>> 6bfa6abbe (Update scripts version)
template/ru/default/etersoft/timersplash.html.tmpl
View file @ 6e17525b
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,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>
...@@ -59,3 +60,6 @@ ...@@ -59,3 +60,6 @@
======= =======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?10_11_2020"></script> <script language="javascript" type="text/javascript" src="js/etersoft/timer.js?10_11_2020"></script>
>>>>>>> fa750493b (Update scripts version) >>>>>>> fa750493b (Update scripts version)
=======
<script language="javascript" type="text/javascript" src="js/etersoft/timer.js?09_11_2020_"></script>
>>>>>>> 6bfa6abbe (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