Skip to content

Commit 3c845e8

Browse files
authored
Merge branch 'main' into fix-links
2 parents 3c7f17d + f1bfcbf commit 3c845e8

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

docs/source/_templates/layout.html

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@
1515
<ul>
1616
<li id="ftc-page-link"><a href="https://www.firstinspires.org/resource-library/ftc/game-and-season-info" target="_blank"><i>FIRST</i> Official Team Resources</a></li>
1717
<li id="qa-link"><a href="https://ftc-qa.firstinspires.org/" target="_blank">Official Game Q&A</a></li>
18-
<script id="headerscript">
19-
if( new Date().getMonth() == 3 && new Date().getDate() == 1) {
20-
document.getElementById("headerscript").insertAdjacentHTML("afterend", '<li id="water-link"><a href="https://www.youtube.com/watch?v=dQw4w9WgXcQ">Water Game</a></li>');
21-
}
22-
</script>
2318
</ul>
2419
</div>
2520
</div>

docs/source/programming_resources/shared/installing_kotlin/Installing-Kotlin.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ many new features and syntax that can make it easier to write code and less pron
1818
the features of Kotlin include:
1919

2020
* Full interoperability with Java; you can use Java classes and libraries from Kotlin and vice versa.
21-
* Dynamic typing; Kotlin allows you to use dynamic typing when needed, that is, you don't need
21+
* Type inference; Kotlin allows you to use type inference when needed, that is, you don't need
2222
to specify the type of a variable when it can be inferred from the context
2323
(``var myString = "Hi!"``).
2424
* No semicolons; Kotlin does not require semicolons to end statements.

0 commit comments

Comments
 (0)