Fixed a merge error.
This commit is contained in:
parent
340eede26c
commit
9acdb5b620
|
@ -56,7 +56,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -960,4 +966,49 @@
|
@@ -960,4 +966,49 @@
|
||||||
>>>>>>> MCP Update. Fixed a few small bugs in the linux scripts.
|
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue