diff options
Diffstat (limited to 'docs/configuration.md')
| -rw-r--r-- | docs/configuration.md | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/configuration.md b/docs/configuration.md index 3b565e4347..57e47bf1b9 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -431,7 +431,6 @@ Apart from these, the following properties are also available, and may be useful </td> </tr> <tr> -<<<<<<< HEAD <td>spark.logConf</td> <td>false</td> <td> |