Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Normand Erwan
VVVVVV_level_merger
Commits
64038df1
Commit
64038df1
authored
Jun 01, 2015
by
Orbmancer
Browse files
first try merging !
Still a little buggy
parent
e9c6a314
Changes
1
Hide whitespace changes
Inline
Side-by-side
merge.php
View file @
64038df1
...
...
@@ -17,7 +17,7 @@ $final->fillBlank();
foreach
(
$levels
as
$level
){
$myContent
=
new
Tabs
();
$myContent
->
importXML
(
$level
[
'
content
'
]);
$myContent
->
importXML
(
$level
[
'
data
'
]);
$final
->
setTab
(
$myContent
->
getTab
(),
$level
[
'x'
],
$level
[
'y'
]);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment