diff --git a/33222tt b/33222tt
index 7d4b09c..8e7eef4 100644
--- a/33222tt
+++ b/33222tt
@@ -1,2 +1,6 @@
 
+<<<<<<< HEAD
 "lalalalal"  
+=======
+第三方第三方
+>>>>>>> a9a5abe543686de03d60d81efc17f6be0e24ecd0
diff --git a/test.js b/test.js
index 4c771f0..ddde003 100644
--- a/test.js
+++ b/test.js
@@ -1,4 +1,4 @@
 const crongit = require('./index.js')();
 
-crongit.pull({}, ()=>{console.log('good')}, ()=>{console.log('bed')});
-//crongit.schedule("10 * * * * *", ()=>console.log('test ok!!!\nuse Ctrl+C to exit!!'), ()=>console.log('pull err err err err!!!!'));
+//crongit.pull({}, ()=>{console.log('good')}, ()=>{console.log('bed')});
+crongit.schedule("10 * * * * *", ()=>console.log('test ok!!!\nuse Ctrl+C to exit!!'), ()=>console.log('pull err err err err!!!!'));