You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@amoro.apache.org by ji...@apache.org on 2024/07/16 12:18:55 UTC

(amoro-shade) 01/01: Merge main & Fix conflicts

This is an automated email from the ASF dual-hosted git repository.

jinsongzhou pushed a commit to branch 0.7.x
in repository https://gitbox.apache.org/repos/asf/amoro-shade.git

commit 7aae8728b24516af687251b112b27beb4261d0c7
Merge: 57573d6 0baf6a6
Author: zhoujinsong <zh...@163.com>
AuthorDate: Tue Jul 16 20:18:18 2024 +0800

    Merge main & Fix conflicts

 .gitignore                               | 2 +-
 tools/releasing/create_source_release.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --cc .gitignore
index be7a619,9e355da..bd85250
--- a/.gitignore
+++ b/.gitignore
@@@ -3,4 -3,4 +3,4 @@@
  target
  *.iml
  tools/release
- .DS_Store
 -**/.DS_Store
++**/.DS_Store