QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-17 20:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

SPRINT-18: added slack middleware module

Browse Source
This commit is contained in:
Tim Chamberlain
2023-01-12 20:16:06 -06:00
parent 41877a7055
commit a556bf9764
8 changed files with 1511 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qqq-dev-tools/bin/resolve-pom-conflicts.sh
View File

@ -4,5 +4,4 @@
## resolve-pom-conflicts.sh
## Tries to automatically resove pom conflicts by putting SNAPSHOT back
############################################################################
gsed "/Updated upstream/,/=======/d" pom.xml | gsed "/Stashed/d" > /tmp/temp-pom.xml
mv /tmp/temp-pom.xml pom.xml
gsed -i "/Updated upstream/,/=======/d;/Stashed/d" pom.xml