project.config.json冲突

5 years ago · 6e1bda3090
1 changed files with 6 additions and 0 deletions
--- a/6
+++ b/6
@ -0,0 +1,6 @@
+Merge branch 'release'
+# Please enter a commit message to explain why this merge is necessary,
+# especially if it merges an updated upstream into a topic branch.
+#
+# Lines starting with '#' will be ignored, and an empty message aborts
+# the commit.