From eaaf7b7b572f4e2f2a20ae347c7f6f379275baa6 Mon Sep 17 00:00:00 2001
From: "pengfei.zhou" <pengfeizhou@foxmail.com>
Date: Fri, 25 Oct 2019 14:30:51 +0800
Subject: [PATCH] fix rebase error

---
 demo/src/Counter.ts |  4 ----
 demo/src/Snake.ts   | 10 ----------
 2 files changed, 14 deletions(-)

diff --git a/demo/src/Counter.ts b/demo/src/Counter.ts
index 45d06333..9857dfa4 100644
--- a/demo/src/Counter.ts
+++ b/demo/src/Counter.ts
@@ -96,7 +96,6 @@ class CounterVM extends ViewModel<CountModel, CounterView> {
 
 @Entry
 class MyPage extends VMPanel<CountModel, CounterView>{
-<<<<<<< HEAD
 
 
     getViewHolderClass() {
@@ -104,9 +103,6 @@ class MyPage extends VMPanel<CountModel, CounterView>{
     }
 
     getViewModelClass() {
-=======
-    getVMClass() {
->>>>>>> debug ts code
         return CounterVM
     }
 
diff --git a/demo/src/Snake.ts b/demo/src/Snake.ts
index e65c65d0..f32c4bd3 100644
--- a/demo/src/Snake.ts
+++ b/demo/src/Snake.ts
@@ -346,17 +346,7 @@ class SnakeVM extends ViewModel<SnakeModel, SnakeView>{
 }
 @Entry
 class SnakePanel extends VMPanel<SnakeModel, SnakeView>{
-<<<<<<< HEAD
     getViewModelClass() {
-=======
-
-    constructor() {
-        super()
-        console.log("SnakePanel")
-    }
-
-    getVMClass() {
->>>>>>> fix debug
         return SnakeVM
     }
     getState(): SnakeModel {