Merge
This commit is contained in:
parent
7fa7a022ef
commit
bb272c60b6
1 changed files with 0 additions and 3 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1,5 +1,3 @@
|
|||
<<<<<<< HEAD
|
||||
=======
|
||||
wordpress-3.0.1.tar.gz
|
||||
/wordpress-3.0.2.tar.gz
|
||||
/wordpress-3.0.3.tar.gz
|
||||
|
|
@ -35,5 +33,4 @@ wordpress-3.0.1.tar.gz
|
|||
/wordpress-3.5-RC1.tar.gz
|
||||
/wordpress-3.5-RC2.tar.gz
|
||||
/wordpress-3.5-RC3.tar.gz
|
||||
>>>>>>> master
|
||||
/wordpress-3.5.tar.gz
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue