update readme

thai321 · Oct 20, 2017 · e71de74 · e71de74
1 parent 56bcabf
commit e71de74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/Guidance/README.md b/Guidance/README.md
@@ -43,13 +43,10 @@
 #### Search
 - User can search for any guides and other users by keyword
 
-<<<<<<< HEAD
 #### Taggings
 - User can add tag to their guides
 - Each project has tags on it
 
-=======
->>>>>>> abe1ee677cd786690b066780917287356beee090
 
 ----------
 ## Steps
@@ -143,11 +140,10 @@
 #### Guides Sort By
 - Currently, a user's guides can only be shown in the order of when a note was last updated at. I plan to allow users the capability of sorting their guides by date created, date update uploaded, and guide title. With this filtering capability, users will given more control of how they prefer their notes to be organized and will greatly increase their user experience.
 
-<<<<<<< HEAD
-=======
+
 #### Taggings
 - User can add tag to their guides
->>>>>>> abe1ee677cd786690b066780917287356beee090
+
 
 #### classes
 - Guides can be classified into different group like classes (Math, Computer Science, Music, ...)

diff --git a/README.md b/README.md
@@ -43,13 +43,10 @@
 #### Search
 - User can search for any guides and other users by keyword
 
-<<<<<<< HEAD
 #### Taggings
 - User can add tag to their guides
 - Each project has tags on it
 
-=======
->>>>>>> abe1ee677cd786690b066780917287356beee090
 
 ----------
 ## Steps
@@ -143,11 +140,10 @@
 #### Guides Sort By
 - Currently, a user's guides can only be shown in the order of when a note was last updated at. I plan to allow users the capability of sorting their guides by date created, date update uploaded, and guide title. With this filtering capability, users will given more control of how they prefer their notes to be organized and will greatly increase their user experience.
 
-<<<<<<< HEAD
-=======
+
 #### Taggings
 - User can add tag to their guides
->>>>>>> abe1ee677cd786690b066780917287356beee090
+
 
 #### classes
 - Guides can be classified into different group like classes (Math, Computer Science, Music, ...)