add

miaomiao/www/js/controllers/home.js

@@ -3,7 +3,6 @@
         , function ($scope, $ionicTabsDelegate, $http, config, $state, $ionicSlideBoxDelegate, msg, $ionicPopover, homeService, $ionicPopup, $timeout, $ionicSideMenuDelegate, $rootScope) {
         $scope.$on('$ionicView.enter', function () {
             $ionicTabsDelegate.showBar(true);
-<<<<<<< HEAD
             $scope.load(true);
             $ionicSlideBoxDelegate.start();
             //$scope.options = {
@@ -11,10 +10,7 @@
             //    effect: 'fade',
             //    speed: 500
             //};
-=======
-            // $scope.load(true);
-            // $ionicSlideBoxDelegate.start();
->>>>>>> fa7104106269bc560d4f8f7cea272aafb8862c92
+
             homeService.messageInfo().then(function(result){
                 $scope.infos = result.data.data;
                 if($scope.infos.letter.is_read==0 && $scope.infos.reply.is_read==0 && $scope.infos.systemInfo.is_read==0){