| /plugin/jplayer/vendor/robloach/component-installer/src/ComponentInstaller/Process/ |
| H A D | RequireJsProcess.php | 225 $merged = $array1;
229 $merged[] = $value;
231 if (is_array($value) && isset($merged[$key]) && is_array($merged[$key])) {
232 $merged[$key] = $this->arrayMergeRecursiveDistinct($merged[$key], $value);
235 $merged[$key] = $value;
240 return $merged;
|
| /plugin/conflictmerger/lang/en/ |
| H A D | conflict-solved.txt | 1 ====== A newer version was merged ======
7 could be merged automatically.
10 the merged version. Examine them, then decide if you want to save the merged
|
| H A D | conflict-unsolved.txt | 7 merged automatically.
|
| /plugin/jplayer/vendor/mustache/mustache/ |
| H A D | CONTRIBUTING.md | 26 …Those will be updated — per [semver](http://semver.org) — once your change is merged into `master`.
28 …* ... Don't update the wiki until your change is merged and released, but make a note in your pull…
|
| /plugin/findologicxmlexport/vendor/jms/metadata/ |
| H A D | CONTRIBUTING.md | 24 New features without tests can't be merged.
39 ## Getting merged
|
| /plugin/findologicxmlexport/vendor/jms/serializer/ |
| H A D | CONTRIBUTING.md | 28 New features without tests can't be merged.
66 ## Getting merged
81 Pull requests without tests most probably will not be merged.
|
| /plugin/combo/vendor/antlr/antlr4-php-runtime/src/Atn/ |
| H A D | ATNConfigSet.php | 175 $merged = PredictionContext::merge($existing->context, $config->context, $rootIsWildcard, $mergeCache);
191 $existing->context = $merged;
|
| /plugin/findologicxmlexport/vendor/doctrine/instantiator/ |
| H A D | CONTRIBUTING.md | 34 won't be merged.
|
| /plugin/findologicxmlexport/vendor/doctrine/instantiator/docs/en/ |
| H A D | index.rst | 55 satisfying this requirement won’t be merged.
|
| /plugin/dokucrypt2/ |
| H A D | OLDER_VERSIONS.md | 9 NOTE: This fix was merged into Dokuwiki core as of Oct, 10 2019. So new versions of Dokuwiki released after that date will not need this patch.
|
| /plugin/xlsx2dw/ |
| H A D | README.md | 4 The plugin keeps the styles, merged cells and colors of your original table.
|
| /plugin/findologicxmlexport/vendor/phpunit/php-code-coverage/ |
| H A D | ChangeLog-2.2.md | 15 …nbergmann/php-code-coverage/pull/368): Blacklists and whitelists are not merged when merging data …
|
| /plugin/elasticsearch/vendor/elasticsearch/elasticsearch/docs/build/Elasticsearch/Namespaces/ |
| H A D | TextStructureNamespace.asciidoc | 32 $params['line_merge_size_limit'] = (int) Maximum number of characters permitted in a single message when lines are merged to create messages. (Default = 10000)
|
| /plugin/conflictmerger/ |
| H A D | action.php | 108 * case, as the contents weren't merged, the revision to check conflicts
|
| /plugin/addnewpage/ |
| H A D | README.md | 39 During this time, he merged several improvements and fixes contributed by these fine people:
|
| /plugin/pot/ |
| H A D | README.md | 66 …* the general config settings will be merged ( overwritten ) by the page code (if set), and finall…
|
| /plugin/findologicxmlexport/vendor/twig/twig/doc/ |
| H A D | deprecated.rst | 148 * ``\Twig\Loader\ExistsLoaderInterface`` (merged with ``\Twig\Loader\LoaderInterface``)
149 * ``\Twig\Loader\SourceContextLoaderInterface`` (merged with ``\Twig\Loader\LoaderInterface``)
|
| /plugin/aichat/vendor/vanderlee/php-sentence/ |
| H A D | README.md | 74 of sentences tend to be merged with the preceding sentences. In most ordinary
|
| /plugin/issuelinks/ |
| H A D | style.less | 145 &.merged {
|
| /plugin/siteexport/ |
| H A D | README.md | 164 mergehint | add hints about the merged content. It can be configured using the meta plugin and the …
177 …d submitted, that page will be generated with the options provided - and merged back up the list (…
|
| /plugin/sequencediagram/bower_components/lodash/vendor/backbone/test/ |
| H A D | collection.js | 1865 assert.equal(options.changes.merged.length, 2);
1910 assert.deepEqual(changed.merged, []);
1923 assert.deepEqual(changed.merged, []);
1963 assert.equal(changed.merged.length, 0);
1990 var mergedModels = options.changes.merged;
2004 var mergedModels = options.changes.merged;
|
| /plugin/strata/ |
| H A D | manual.txt | 126 **Grouping**: By adding a ''group'' block zero or more variables can be grouped. This means that all results that have the same value for the grouped variable will be merged, and the ungrouped variables will contain multiple values. You can name one variable per line. If the ''group'' is empty //all// results will be merged into a single result.
358 Grouping allows you to collapse multiple results into a single result. All results that have the same value for all variables mentioned in the group block will be merged into a single result. Any variable in the merged result that is not mentioned in the group block will contain multiple values.
|
| /plugin/topbarsyntax/ |
| H A D | csshover3.htc | 112 // since IE6 doesn't support multiple classnames, this is merged into one classname
|
| /plugin/odt/ |
| H A D | ChangeLog.txt | 18 * Added/merged support for exporting books to ODT (interface to bookcreator plugin).
|
| /plugin/jplayer/vendor/kriswallsmith/assetic/ |
| H A D | README.md | 17 // the code is merged when the asset is dumped
|