]> _ Git - fluidbook-toolbox-quiz.git/commitdiff
projects / fluidbook-toolbox-quiz.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0059f42 46c5a5c)
Merge remote-tracking branch 'origin/master'
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 4 Oct 2023 11:46:59 +0000 (13:46 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Wed, 4 Oct 2023 11:46:59 +0000 (13:46 +0200)
# Conflicts:
# .idea/deployment.xml

1  2 
.idea/deployment.xml patch | | diff2 | blob | history

diff --cc .idea/deployment.xml
index 0000000000000000000000000000000000000000,ef50088e62e6f614a7020fd7fad1ef1930feaf0e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/.idea/deployment.xml
+++ b/.idea/deployment.xml
Unnamed repository; edit this file 'description' to name the repository.