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

Attempt to merge develop into branch #278

Conversation

GhettoKiwi
Copy link
Contributor

Signed-off-by: Benjamin Mønster [email protected]
Made by @sam94dion

Benjamin Mønster added 10 commits February 14, 2023 08:32
Signed-off-by: Benjamin Mønster <[email protected]>
Signed-off-by: Benjamin Mønster <[email protected]>
Signed-off-by: Benjamin Mønster <[email protected]>
Signed-off-by: Benjamin Mønster <[email protected]>
Signed-off-by: Benjamin Mønster <[email protected]>
Signed-off-by: Benjamin Mønster <[email protected]>
FIx
Signed-off-by: Benjamin Mønster <[email protected]>
Signed-off-by: Benjamin Mønster <[email protected]>
Benjamin Mønster added 3 commits February 15, 2023 11:23
Signed-off-by: Benjamin Mønster <[email protected]>
Signed-off-by: Benjamin Mønster <[email protected]>
Signed-off-by: Benjamin Mønster <[email protected]>
Benjamin Mønster and others added 11 commits February 15, 2023 12:49
Signed-off-by: Benjamin Mønster <[email protected]>
Signed-off-by: Benjamin Mønster <[email protected]>
Signed-off-by: Benjamin Mønster <[email protected]>
Signed-off-by: Benjamin Mønster <[email protected]>
Signed-off-by: Benjamin Mønster <[email protected]>
Signed-off-by: Benjamin Mønster <[email protected]>
Remove commenting out of linkage, replaced with new issue
Fix SQLCA.cpy to not use binary-long binary-short

Signed-off-by: Rune Christensen <[email protected]>
…ts-by-sam94dion

# Conflicts:
#	scripts/windows_gnucobol_run_tests.cmd
#	src/main/java/org/openmainframeproject/cobolcheck/features/interpreter/InterpreterController.java
#	src/main/java/org/openmainframeproject/cobolcheck/services/cobolLogic/Interpreter.java
#	src/test/java/org/openmainframeproject/cobolcheck/InterpreterControllerTest.java
#	src/test/java/org/openmainframeproject/cobolcheck/MockIT.java
Signed-off-by: Rune Christensen <[email protected]>
Copy link
Collaborator

@dakaa16 dakaa16 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will approve even though there are a lot of formatting that I do not agree with

Copy link
Collaborator

@ThomasNellemann ThomasNellemann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok with me

Rune Christensen added 2 commits August 11, 2023 12:43
…ts-by-sam94dion

# Conflicts:
#	src/main/java/org/openmainframeproject/cobolcheck/features/interpreter/InterpreterController.java
#	src/test/java/org/openmainframeproject/cobolcheck/MockIT.java
@Rune-Christensen Rune-Christensen merged commit 518d232 into Developer Aug 14, 2023
7 checks passed
@Rune-Christensen Rune-Christensen deleted the FIx-unresolved-comments-from-pullrequests-by-sam94dion branch August 14, 2023 10:01
This was referenced Aug 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants