1 files changed, 2 insertions, 9 deletions
diff --git a/user/user.h b/user/user.h
index ed7737a..5d6222e 100644
--- a/user/user.h
+++ b/user/user.h
@@ -35,14 +35,13 @@ int pgaccess(void *base, int len, void *mask);
 // usyscall region
 int ugetpid(void);
 #endif
-<<<<<<< HEAD
-=======
 int trace(int);
 int sysinfo(struct sysinfo*);
 int sigalarm(int ticks, void (*handler)());
 int sigreturn(void);
 int symlink(char *, char *);
->>>>>>> fs
+void *mmap(void *, uint64, int, int, int, uint64);
+int munmap(void *, uint64);
 
 // ulib.c
 int stat(const char*, struct stat*);
@@ -60,12 +59,6 @@ void free(void*);
 int atoi(const char*);
 int memcmp(const void *, const void *, uint);
 void *memcpy(void *, const void *, uint);
-<<<<<<< HEAD
-#ifdef LAB_LOCK
-int statistics(void*, int);
-#endif
-=======
 
 // statistics.c
 int statistics(void*, int);
->>>>>>> fs