diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2021-09-27 07:08:36 +0000 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2021-09-27 07:08:36 +0000 |
| commit | fe64026f259df982a7c5a5bdf093603dfb3e486d (patch) | |
| tree | af2eb9124be1bcec9c359a8029ef1425eea3afdb /CMakeLists.txt | |
| parent | 4f0e63ee85a845b4b959bd70a9661b63cb590344 (diff) | |
| parent | 9377da84086392e118d69b467006e73fe9ae3f70 (diff) | |
Merge branch 'master' into bratseth/linguistics-components
Conflicts:
linguistics-components/src/main/resources/configdefinitions/sentence-piece.def
linguistics/src/main/resources/configdefinitions/language.sentencepiece.sentence-piece.def
linguistics/src/main/resources/configdefinitions/sentence-piece.def
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bae27287f2..c9980fb1928 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,6 @@ add_subdirectory(config) add_subdirectory(config-model-fat) add_subdirectory(configd) add_subdirectory(configdefinitions) -add_subdirectory(configgen) add_subdirectory(configserver) add_subdirectory(configserver-flags) add_subdirectory(configutil) |