d

miaomiao/www/js/controllers/home.js

@@ -147,10 +147,6 @@
                 msg.hide();
                 console.log(result);
                 $scope.dream = result.data.data;
-<<<<<<< HEAD
-=======
-                // debugger
->>>>>>> bd2a06d43002cbe895ec60f09655550a57e97709
                 var end_time = new Date($scope.dream.end_time.replace(/-/g, "/"));
                 var date = new Date();
                 var inter = (end_time.getTime() - date.getTime()) / 1000;