diff --git a/templates/index.html b/templates/index.html index e945884..230ff28 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,346 +1,10 @@ -<<<<<<< HEAD -======= - - ->>>>>>> fd4bad4afe3ac3b7bcb321c7dc16ee38401527c5 -<<<<<<< HEAD Korpus paralelnih besdil ANG-SLO
Korpus Gigafida -======= -
-
-
-
-
-

Portal za oddajanje besedil za DS4 in DS1

- -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- -
-
- - - - - - ->>>>>>> fd4bad4afe3ac3b7bcb321c7dc16ee38401527c5