Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase to fix merge conflicts in #21 #23

Merged
merged 19 commits into from
Apr 2, 2024
Merged

Conversation

sodle-splunk
Copy link
Contributor

@sodle-splunk sodle-splunk commented Mar 28, 2024

Rebase next onto main, to fix merge conflicts in the next->main PR (#21)

Some tests are failing, as documented in #19

cpangam and others added 19 commits January 19, 2022 16:24
Merging next to main for release 2.3.8
Gmail: Fixing app version in the release notes
Merging next to main for release 2.4.0
Merging next to main for release 2.5.0
* Remove semgrep workflow file

* 'convert readme.html to manual_readme_content.md'

* fix for message attachment type

* release notes

* licensing fix

* Update README.md

* removed error print duplicated

* Bumped up the version of googleworkspaceforgmail from 2.5.0 to 2.5.1

* Release notes for version 2.5.1

* Release notes for version 2.5.1

---------

Co-authored-by: splunk-soar-connectors-admin <admin@splunksoar>
Co-authored-by: Michał Posłuszny <mposluszny@splunk.com>
Co-authored-by: mposluszny-splunk <150343546+mposluszny-splunk@users.noreply.github.com>
Co-authored-by: root <root@splunksoar>
@sodle-splunk sodle-splunk changed the title Rebase to fix merge conflicts in !12 Rebase to fix merge conflicts in !21 Mar 28, 2024
@sodle-splunk sodle-splunk changed the title Rebase to fix merge conflicts in !21 Rebase to fix merge conflicts in #21 Mar 28, 2024
@sodle-splunk sodle-splunk merged commit 8243fe2 into next Apr 2, 2024
7 of 9 checks passed
@sodle-splunk sodle-splunk deleted the sodle/rebase/PAPP-33473 branch April 2, 2024 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants