78-add-keeping-new-ts #79

Merged
romanov73 merged 5 commits from 78-add-keeping-new-ts into master 2 years ago

5 Commits (master)

Author SHA1 Message Date
Anton Romanov df67684968 #78 -- fix code 2 years ago
Anton Romanov 23a852786a Merge branch 'master' into 78-add-keeping-new-ts
# Conflicts:
#	src/main/java/ru/ulstu/extractor/ts/model/TimeSeries.java
2 years ago
alexandra 33e426e7f5 #78 - Add Dummy 2 years ago
alexandra 4de0e37902 #78 - Add FileTS 2 years ago
BarminaA 3b7812a075 #76-create authorTS 2 years ago