Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
brody
ISPConfig 3
Commits
abcae111
Commit
abcae111
authored
Nov 12, 2018
by
Marius Burkard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- fixed spare merge conflict line
parent
d8193946
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
1 deletion
+0
-1
interface/lib/classes/functions.inc.php
interface/lib/classes/functions.inc.php
+0
-1
No files found.
interface/lib/classes/functions.inc.php
View file @
abcae111
...
@@ -536,7 +536,6 @@ class functions {
...
@@ -536,7 +536,6 @@ class functions {
}
}
}
}
>>>>>>>
ispconfig3
.
official
/
master
}
}
?>
?>
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