Skip to content

Conversation

@paulparkinson
Copy link
Member

No description provided.

# Conflicts:
#	travelbooking/installGraalVM.sh
#	travelbooking/travelagency-java/pom.xml
#	travelbooking/travelagency-java/src/main/java/osaga/travelagency/TravelAgencyApplication.java
#	travelbooking/travelparticipant-java/src/main/java/osaga/travelagency/TravelParticipantApplication.java
#	workshops/eventmesh-teq-kafka/cloud-setup/destroy.sh
#	workshops/eventmesh-teq-kafka/cloud-setup/setup.sh
#	workshops/eventmesh-teq-kafka/cloud-setup/utils/deleteWorkingDir.sh
#	workshops/eventmesh-teq-kafka/cloud-setup/utils/objstore-destroy.sh
#	workshops/eventmesh-teq-kafka/cloud-setup/utils/state-functions.sh
#	workshops/eventmesh-teq-kafka/cloud-setup/utils/terraform.sh
#	workshops/eventmesh-teq-kafka/okafka/build.sh
# Conflicts:
#	travelbooking/travelagency-java/src/main/java/osaga/travelagency/TravelAgencyApplication.java
renagranat
renagranat previously approved these changes Jan 24, 2022
@paulparkinson paulparkinson merged commit 22218c0 into oracle:main Jan 24, 2022
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.

3 participants