Skip to content
Snippets Groups Projects
Commit 45aab2b3 authored by David Bühler's avatar David Bühler
Browse files

[Eva] Adds .merlin file in Eva to solve file conflicts between plugins.

Instructs merlin to first look in Eva directories.
parent b4306e3c
No related branches found
No related tags found
No related merge requests found
...@@ -1315,6 +1315,7 @@ src/plugins/studia/writes.mli: CEA_LGPL_OR_PROPRIETARY ...@@ -1315,6 +1315,7 @@ src/plugins/studia/writes.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/users/Users.mli: CEA_LGPL_OR_PROPRIETARY src/plugins/users/Users.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/users/users_register.ml: CEA_LGPL_OR_PROPRIETARY src/plugins/users/users_register.ml: CEA_LGPL_OR_PROPRIETARY
src/plugins/users/users_register.mli: CEA_LGPL_OR_PROPRIETARY src/plugins/users/users_register.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/value/.merlin: .ignore
src/plugins/value/Changelog_non_free: .ignore src/plugins/value/Changelog_non_free: .ignore
src/plugins/value/Eva.mli: CEA_LGPL_OR_PROPRIETARY src/plugins/value/Eva.mli: CEA_LGPL_OR_PROPRIETARY
src/plugins/value/alarmset.ml: CEA_LGPL_OR_PROPRIETARY src/plugins/value/alarmset.ml: CEA_LGPL_OR_PROPRIETARY
......
B ./**
S ./**
B ../value_types/**
S ../value_types/**
REC
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment