Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@esilva-everbridge
esilva-everbridge committed May 18, 2018
2 parents aca53d3 + 74b986b commit 4468da5
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@

generate-secure-pillar [global options] command [command options] [arguments...]

<<<<<<< HEAD
## VERSION 1.0.323
=======
## VERSION 1.0.322
>>>>>>> 74b986b1481f285b71997c406a4beb870c0af6d9
## AUTHOR

Expand Down

0 comments on commit 4468da5

Please sign in to comment.