diff options
| author | Alex <alex@adnab.me> | 2021-04-30 15:47:11 +0200 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2021-04-30 15:47:11 +0200 |
| commit | b1f60579a13d3c5eba7f74b1775c84639ea9b51a (patch) | |
| tree | 2581343ea7a97118064191ce06639e72d37bfa20 /doc/talks/2021-04-28_spirals-team/figures/conflict_base.pdf | |
| parent | dcfc32cf85bc6276fdff2492898c1cbb527e9b9d (diff) | |
| parent | be3b1d8f91b7e9a42dee9083ee0e9ebf52bbc57f (diff) | |
| download | garage-b1f60579a13d3c5eba7f74b1775c84639ea9b51a.tar.gz garage-b1f60579a13d3c5eba7f74b1775c84639ea9b51a.zip | |
Merge pull request 'created doc/talks subfolder and added my talk and the previous one done at the wide team' (#67) from talks into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/67
Diffstat (limited to 'doc/talks/2021-04-28_spirals-team/figures/conflict_base.pdf')
| -rw-r--r-- | doc/talks/2021-04-28_spirals-team/figures/conflict_base.pdf | bin | 0 -> 26396 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/doc/talks/2021-04-28_spirals-team/figures/conflict_base.pdf b/doc/talks/2021-04-28_spirals-team/figures/conflict_base.pdf Binary files differnew file mode 100644 index 00000000..95fe0544 --- /dev/null +++ b/doc/talks/2021-04-28_spirals-team/figures/conflict_base.pdf |