bugfix

83424076 · jiangjiantao · 984d13a4 · 83424076
Commit 83424076 authored Feb 21, 2020 by jiangjiantao
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

home.js pages/home/home.js +0 -3

No files found.
--- a/pages/home/home.js
+++ b/pages/home/home.js
-<<<<<<< HEAD
-=======
 var api = require("../../utils/api.js");
 import { Page } from '../../utils/scan';
->>>>>>> aa0dfba9ee3f14735718232a68135631a24f8e7c
 import { API_USE_COUPON } from '../../const/apiurl'
 import { ACTION_GO_SCAN } from '../../const/actioncmd'
 import { ACTION_GET_ACCOUNT } from '../../const/actioncmd'