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

shuai pushed a commit to branch podling
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git


The following commit(s) were added to refs/heads/podling by this push:
     new 2ab29c0e chore: update screenshot img
2ab29c0e is described below

commit 2ab29c0eec2dfb851c5a97ba895c9d1808e7870b
Author: shuai <[email protected]>
AuthorDate: Wed Nov 1 12:37:05 2023 +0800

    chore: update screenshot img
---
 README.md               |   5 -----
 docs/img/screenshot.png | Bin 89118 -> 88558 bytes
 2 files changed, 5 deletions(-)

diff --git a/README.md b/README.md
index 5c752c8e..fa329b3a 100644
--- a/README.md
+++ b/README.md
@@ -8,12 +8,7 @@ A Q&A platform software for teams at any scales. Whether it’s 
a community foru
 
 To learn more about the project, visit 
[answer.apache.org](https://answer.apache.org).
 
-<<<<<<< HEAD
-[![LICENSE](https://img.shields.io/github/license/answerdev/answer)](https://github.com/apache/incubator-answer/blob/main/LICENSE)
-=======
-
 
[![LICENSE](https://img.shields.io/github/license/apache/incubator-answer)](https://github.com/apache/incubator-answer/blob/main/LICENSE)
->>>>>>> 1f7e244db31ee80d649efa34f90cc520137be9b7
 
[![Language](https://img.shields.io/badge/language-go-blue.svg)](https://golang.org/)
 
[![Language](https://img.shields.io/badge/language-react-blue.svg)](https://reactjs.org/)
 [![Go Report 
Card](https://goreportcard.com/badge/github.com/apache/incubator-answer)](https://goreportcard.com/report/github.com/apache/incubator-answer)
diff --git a/docs/img/screenshot.png b/docs/img/screenshot.png
index 0907c2f5..555de500 100644
Binary files a/docs/img/screenshot.png and b/docs/img/screenshot.png differ

Reply via email to