Skip to content

Commit

Permalink
Merge branches
Browse files Browse the repository at this point in the history
  • Loading branch information
@rhymeswithmogul
rhymeswithmogul committed Dec 24, 2020
1 parent 23ed6c9 commit 01a223b
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions RdpToolkit.psd1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@
RootModule = 'src/RdpToolkit.psm1'

# Version number of this module.
<<<<<<< HEAD
ModuleVersion = '1.1'
=======
ModuleVersion = '1.0.1'
>>>>>>> 1e9ec840067eaee606229eda8a26982b7a6b0329

# Supported PSEditions
CompatiblePSEditions = @('Desktop', 'Core')
Expand Down

0 comments on commit 01a223b

Please sign in to comment.