diff --git a/README_BACKUP_1535.md b/README_BACKUP_1535.md new file mode 100644 index 0000000..99ee09b --- /dev/null +++ b/README_BACKUP_1535.md @@ -0,0 +1,5 @@ +<<<<<<< HEAD +123445 +======= +123479 +>>>>>>> feature-x diff --git a/README_BASE_1535.md b/README_BASE_1535.md new file mode 100644 index 0000000..9786385 --- /dev/null +++ b/README_BASE_1535.md @@ -0,0 +1 @@ +123489 \ No newline at end of file diff --git a/README_LOCAL_1535.md b/README_LOCAL_1535.md new file mode 100644 index 0000000..60a423b --- /dev/null +++ b/README_LOCAL_1535.md @@ -0,0 +1 @@ +123445 \ No newline at end of file diff --git a/README_REMOTE_1535.md b/README_REMOTE_1535.md new file mode 100644 index 0000000..99bc952 --- /dev/null +++ b/README_REMOTE_1535.md @@ -0,0 +1 @@ +123479 \ No newline at end of file