FIx

2024-05-27 18:23:09 +02:00 · 2024-05-27 18:23:09 +02:00 · cff2a97b2f
commit cff2a97b2f
parent e5f577f577 a41802301e
1 changed files with 4 additions and 0 deletions
--- a/tRules.tex
+++ b/tRules.tex
@ -26,7 +26,11 @@ class List<A extends Object> {
    List<A> add(A v){..,}
 }
 \end{lstlisting}
+<<<<<<< HEAD
 TODO
+=======
+%TODO
+>>>>>>> a41802301ef93ae65e927f8046eb9efc656aeba6
 \\[1em]
 \noindent
 \textit{Additional Notes:}%