diff options
author | Joris | 2017-04-05 17:33:26 +0000 |
---|---|---|
committer | Joris | 2017-04-05 17:33:26 +0000 |
commit | a2546f8c5e940923644d519a02e73eee6c2d201a (patch) | |
tree | 445db0f6deb35a3e6b91193fb9693339e9d16267 /src/main/scala/reading/models/GroupedTheme.scala | |
parent | 0b2c5c1a52716bc06dfb4b2ad4e861f7ca2b6b7e (diff) | |
parent | baeb16e6749feea5859af71fe0db8a277f9fb261 (diff) | |
download | reading-a2546f8c5e940923644d519a02e73eee6c2d201a.tar.gz reading-a2546f8c5e940923644d519a02e73eee6c2d201a.tar.bz2 reading-a2546f8c5e940923644d519a02e73eee6c2d201a.zip |
Merge branch 'add-books' into 'master'
prog
See merge request !5
Diffstat (limited to 'src/main/scala/reading/models/GroupedTheme.scala')
-rw-r--r-- | src/main/scala/reading/models/GroupedTheme.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/scala/reading/models/GroupedTheme.scala b/src/main/scala/reading/models/GroupedTheme.scala index f36d7fd..1e758d6 100644 --- a/src/main/scala/reading/models/GroupedTheme.scala +++ b/src/main/scala/reading/models/GroupedTheme.scala @@ -48,7 +48,7 @@ object GroupedTheme extends Enum[GroupedTheme] { case Nature | Aventure | Initiation | Pirate | Voyage | Animal => Decouverte case Dragon | Magie => Imaginaire case Mutant | Beaute | Handicap | Homosexualite | Laideur | Metamorphose | Marginalite | Migration | Metissage | Pauvrete | Discrimination => Difference - case Maltraitance | Viol | Combat | Conflit | Crime | Harcelement | Exclusion | Racisme | Antisemitisme | SegregationRaciale | Prison => Violence + case Maltraitance | Viol | Combat | Conflit | Crime | Harcelement | Exclusion | Racisme | Antisemitisme | SegregationRaciale | Prison | Drogues => Violence case Chevalerie | Cour | Dictature | Guerre | Nazisme | Revolution => Histoire case Theme.Humour => GroupedTheme.Humour case Enquete | Manipulation | Mensonge | Secret | Espionnage | Complot => Stratageme |