You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@logging.apache.org by fr...@apache.org on 2024/08/11 20:21:47 UTC

(logging-log4net) 02/02: Merge remote-tracking branch 'origin/Feature/142-DisableTrimming' into Feature/142-DisableTrimming

This is an automated email from the ASF dual-hosted git repository.

freeandnil pushed a commit to branch Feature/142-DisableTrimming
in repository https://gitbox.apache.org/repos/asf/logging-log4net.git

commit aec7abfdf8c8035a1cda370b84d99f0c137decbf
Merge: 1ce7c303 75a944c2
Author: Jan Friedrich <fr...@apache.org>
AuthorDate: Sun Aug 11 22:21:26 2024 +0200

    Merge remote-tracking branch 'origin/Feature/142-DisableTrimming' into Feature/142-DisableTrimming
    
    # Conflicts:
    #       src/log4net/log4net.csproj

 src/log4net/log4net.csproj | 226 +++++++++++++++++++++++----------------------
 1 file changed, 114 insertions(+), 112 deletions(-)