修改改动

options/locale/locale_en-US.ini

@@ -2659,8 +2659,5 @@ foot.member_news = Member news
 foot.industry_advisory = Industry Advisory
 foot.help = help
 foot.copyright= Copyright: New Generation Artificial Intelligence Open Source Open Platform (OpenI)
-<<<<<<< Updated upstream
 Platform_Tutorial=Platform Tutorial
-=======
 foot.advice_feedback=advice feedback
->>>>>>> Stashed changes

options/locale/locale_zh-CN.ini

@@ -2667,8 +2667,5 @@ foot.member_news=成员动态
 foot.industry_advisory=行业资讯
 foot.help=帮助
 foot.copyright= 版权所有：新一代人工智能开源开放平台（OpenI）
-<<<<<<< Updated upstream
 Platform_Tutorial=新手指引
-=======
 foot.advice_feedback = 意见反馈
->>>>>>> Stashed changes