Björn Schießle
f151376ad5
remove remaining line from merge conflict
|
12 gadi atpakaļ | |
|---|---|---|
| .. | ||
| hooks.php | 12 gadi atpakaļ | |
| versions.php | 12 gadi atpakaļ | |
|
Björn Schießle
f151376ad5
remove remaining line from merge conflict
|
12 gadi atpakaļ | |
|---|---|---|
| .. | ||
| hooks.php | 12 gadi atpakaļ | |
| versions.php | 12 gadi atpakaļ | |