Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

V

Vedonlyontilaskuri
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

d850681f

Commit d850681f authored 3 weeks ago by Genas Petrus Joonatan

Downloads
- Plain Diff

Merge branch 'main' of https://gitlab.jyu.fi/oihietan/ohj2

# Conflicts:
#	src/liiga/Joukkueet.java
#	src/liiga/Ottelu.java

parents 2c8744aa ffb3c196

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

data/bundesID.csv 1 addition, 1 deletion

data/bundesID.csv
data/bundesliigatulokset.csv 1224 additions, 1224 deletions

data/bundesliigatulokset.csv
data/premierID.csv 1 addition, 1 deletion

data/premierID.csv
data/premierliigatulokset.csv 1969 additions, 1967 deletions

data/premierliigatulokset.csv
data/testi.csv 4 additions, 0 deletions

data/testi.csv
src/liiga/Joukkue.java 14 additions, 18 deletions

src/liiga/Joukkue.java
src/liiga/Joukkueet.java 61 additions, 26 deletions

src/liiga/Joukkueet.java
src/liiga/Ottelu.java 29 additions, 10 deletions

src/liiga/Ottelu.java
src/liiga/Ottelut.java 188 additions, 0 deletions

src/liiga/Ottelut.java
src/liiga/aaaa.java 113 additions, 0 deletions

src/liiga/aaaa.java
src/liiga/testi.csv 4 additions, 0 deletions

src/liiga/testi.csv

with 3608 additions and 3247 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment