diff options
| author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-10-18 10:04:57 +0900 |
|---|---|---|
| committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-10-18 10:04:57 +0900 |
| commit | c9562b8cf7a29f4ec2457cb9d9d4530c24225da1 (patch) | |
| tree | fb7d0296af5537ddda7e772a46e959c8ed64fbac /src/util/configuration.c | |
| parent | 9173da4f8c1f4b50ccd9d61f6fa138904740ecfa (diff) | |
| parent | d748b0c920b0581ca65962f34d1f2e94c9a89926 (diff) | |
| download | gnunet-c9562b8cf7a29f4ec2457cb9d9d4530c24225da1.tar.gz gnunet-c9562b8cf7a29f4ec2457cb9d9d4530c24225da1.zip | |
-fix conflict
Diffstat (limited to 'src/util/configuration.c')
| -rw-r--r-- | src/util/configuration.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util/configuration.c b/src/util/configuration.c index 27e6cf612..5c415aff7 100644 --- a/src/util/configuration.c +++ b/src/util/configuration.c | |||
| @@ -91,7 +91,7 @@ struct ConfigSection | |||
| 91 | /** | 91 | /** |
| 92 | * Is the configuration section marked as inaccessible? | 92 | * Is the configuration section marked as inaccessible? |
| 93 | * | 93 | * |
| 94 | * This can happen if the section name is used in an @inline-secret@ | 94 | * This can happen if the section name is used in an \@inline-secret\@ |
| 95 | * directive, but the referenced file can't be found or accessed. | 95 | * directive, but the referenced file can't be found or accessed. |
| 96 | */ | 96 | */ |
| 97 | bool inaccessible; | 97 | bool inaccessible; |
| @@ -135,7 +135,7 @@ struct ConfigFile | |||
| 135 | 135 | ||
| 136 | /** | 136 | /** |
| 137 | * Was this configuration file parsed via | 137 | * Was this configuration file parsed via |
| 138 | * @inline-secret@? | 138 | * \@inline-secret\@? |
| 139 | */ | 139 | */ |
| 140 | char *hint_restrict_section; | 140 | char *hint_restrict_section; |
| 141 | 141 | ||