fix specs, fix merge conflicts and cleanup

2018-01-22 14:23:05 +01:00 · 2018-01-22 14:23:05 +01:00 · 5426dcf989
commit 5426dcf989
parent d9ff845f63
8 changed files with 36 additions and 17 deletions
--- a/src/components/date-picker/panel/Date/date-range.vue
+++ b/src/components/date-picker/panel/Date/date-range.vue
@ -219,7 +219,6 @@
                };
            },
            prevYear (panel) {
-                console.log(this)
                const increment = this.currentView === 'year' ? -10 : -1;
                this.changePanelDate(panel, 'FullYear', increment);
            },