删除临时文件

.gitignore

@@ -7,3 +7,4 @@ dist/settingview
 dist/smsChart
 dist/talkview
 dist/userview
+temp

talkview/temp/manifest/app-js-manifest.json

@@ -1,7 +1,3 @@
 {
-<<<<<<< HEAD
-  "app.js": "app-2c6b56e97c.js"
-=======
-  "app.js": "app-a08eecc16b.js"
->>>>>>> 631276b86f1dd9a332d236f40b67b04cdbc055fa
+  "app.js": "app-574571fb50.js"
 }