diff options
author | Keuin <[email protected]> | 2021-01-21 01:50:08 +0800 |
---|---|---|
committer | Keuin <[email protected]> | 2021-01-21 01:50:08 +0800 |
commit | ac3b5e1476dedcefb723f19bd0fdd9a22fcb16e9 (patch) | |
tree | 75d0994f3f7aa37c3d240933f0f2d179d318e597 /testfile/ObjectCollectionFactoryTest/1/a | |
parent | 82e3986045ac7eaca6aaa290fb2283fd6c6c901a (diff) | |
parent | 7a5297de3467b1069fdf5e4a1b2aaf510ca35663 (diff) |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/keuin/kbackupfabric/operation/backup/PrimitiveBackupMethod.java
Diffstat (limited to 'testfile/ObjectCollectionFactoryTest/1/a')
-rw-r--r-- | testfile/ObjectCollectionFactoryTest/1/a | bin | 0 -> 1024 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/testfile/ObjectCollectionFactoryTest/1/a b/testfile/ObjectCollectionFactoryTest/1/a Binary files differnew file mode 100644 index 0000000..4936a74 --- /dev/null +++ b/testfile/ObjectCollectionFactoryTest/1/a |