From 6c14d6cea399b66f845edcfad34a1df7a0e7ac5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E8=81=9A=E8=8B=B1?= <1347803201@qq.com>
Date: Fri, 15 Dec 2023 23:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MiNote/src/net/micode/notes/ui/AlarmReceiver.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/MiNote/src/net/micode/notes/ui/AlarmReceiver.java b/MiNote/src/net/micode/notes/ui/AlarmReceiver.java
index ad4e2e5..7084847 100644
--- a/MiNote/src/net/micode/notes/ui/AlarmReceiver.java
+++ b/MiNote/src/net/micode/notes/ui/AlarmReceiver.java
@@ -31,4 +31,9 @@ public class AlarmReceiver extends BroadcastReceiver {
         context.startActivity(intent);
     }
 }
+<<<<<<< wjy
 
+=======
+//这是实现alarm这个功能最接近用户层的包，基于上面的两个包，
+//作用还需要深究但是对于setClass和addFlags的
+>>>>>>> local