From 8c6d7f949e1a23e51b6d22073bd917659e4167d4 Mon Sep 17 00:00:00 2001 From: joyfullservice Date: Thu, 19 Oct 2023 15:18:28 -0500 Subject: [PATCH] Resolve conflict with upstream file Putting the comma after the argument seems to be the preferred industry-standard approach, based on ChatGPT and Bard. --- .../modules/clsPerformance.cls | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Version Control.accda.src/modules/clsPerformance.cls b/Version Control.accda.src/modules/clsPerformance.cls index 17fd8bdf..aae14f60 100644 --- a/Version Control.accda.src/modules/clsPerformance.cls +++ b/Version Control.accda.src/modules/clsPerformance.cls @@ -96,6 +96,7 @@ Public Property Get CallStack() As String End Property + '--------------------------------------------------------------------------------------- ' Procedure : CurrentCategoryName ' Author : hecon5 @@ -515,10 +516,10 @@ End Function ' : e 12 3.23 '--------------------------------------------------------------------------------------- ' -Private Function ListResult(strHeading As String _ - , strResult1 As String _ - , strResult2 As String _ - , lngCol() As Long) As String +Private Function ListResult(strHeading As String, _ + strResult1 As String, _ + strResult2 As String, _ + lngCol() As Long) As String Dim strRowHeading As String Dim lngPos As Long @@ -560,9 +561,9 @@ End Function ' Purpose : Pads a string '--------------------------------------------------------------------------------------- ' -Private Function PadRight(strText As String _ - , lngLen As Long _ - , Optional lngMinTrailingSpaces As Long = 1) As String +Private Function PadRight(strText As String, _ + lngLen As Long, _ + Optional lngMinTrailingSpaces As Long = 1) As String Dim strResult As String Dim strTrimmed As String