From 9aff20c1d893f75fc85fdc043b7caec46b8d84f1 Mon Sep 17 00:00:00 2001
From: dylan <497357846@qq.com>
Date: Mon, 10 Aug 2020 13:56:13 +0800
Subject: [PATCH] age.c change

---
 age.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/age.c b/age.c
index e2fc434..dace95c 100644
--- a/age.c
+++ b/age.c
@@ -6,9 +6,5 @@ void setAge(uint8_t age)
 }
 uint8_t getAge(void)
 {
-<<<<<<< HEAD
 	return g_age+2;
-=======
-	return g_age+1;
->>>>>>> eaed4014ac38e524085ca2b65097b2cd05ca2ebe
 }
\ No newline at end of file