Skip to content

Commit b2ac084

Browse files
committed
Merge branch 'master' into release/v2.3
2 parents a0b2a4d + f51a968 commit b2ac084

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99

1010
# Ignore Release directory generated by local builds
1111
Release/
12-
Tools/*.exe
12+
Tools/
1313
ConfluencePS/en-US/
1414
TestResult.xml
15+
!Tools/*.ps1
16+
!Tools/*.msi
1517

1618
#######
1719
# Excerpts from https://www.gitignore.io

ConfluencePS/ConfluencePS.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
# ModuleList = @()
8585

8686
# List of all files packaged with this module
87-
# FileList = ''
87+
# FileList = @()
8888

8989
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
9090
PrivateData = @{

0 commit comments

Comments
 (0)