Merge branch 'wp_branch'

# Conflicts: # test1.txt
3 years ago · 41144e4ab0
parent f68c693477 33e21cb6b0
commit 41144e4ab0
1 changed files with 4 additions and 0 deletions
--- a/test1.txt
+++ b/test1.txt
@ -1,3 +1,7 @@
 111
 222
+<<<<<<< HEAD
 333
+=======
+333
+>>>>>>> wp_branch