Skip to content

Commit

Permalink
Resolve conflict with upstream file
Browse files Browse the repository at this point in the history
Putting the comma after the argument seems to be the preferred industry-standard approach, based on ChatGPT and Bard.
  • Loading branch information
joyfullservice committed Oct 19, 2023
1 parent eae289b commit 8c6d7f9
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions Version Control.accda.src/modules/clsPerformance.cls
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ Public Property Get CallStack() As String

End Property


'---------------------------------------------------------------------------------------
' Procedure : CurrentCategoryName
' Author : hecon5
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 8c6d7f9

Please sign in to comment.