search

clarin-eric / ParlaMint

ParlaMint: Comparable Parliamentary Corpora
https://clarin-eric.github.io/ParlaMint/
43 stars 53 forks source link

Documentation-main #539

Closed matyaskopp closed 1 year ago

matyaskopp commented 1 year ago

@TomazErjavec, can you please resolve this conflict? You have edited this file in both branches: devel(now merged to main) and documentation

TomazErjavec commented 1 year ago

can you please resolve this conflict? You have edited this file in both branches: devel(now merged to main) and documentation

Yes, I messed up. Resolved now I hope.