diff options
| author | Henrik <henrik.hoiness@online.no> | 2018-07-19 10:27:02 +0200 |
|---|---|---|
| committer | Henrik <henrik.hoiness@online.no> | 2018-07-19 10:27:02 +0200 |
| commit | 6891f24fff03f99ef91df675003d00fbb516112c (patch) | |
| tree | 1af252539b5e56b5eaa17f598778f5e4faaf32aa /container-search-gui/src/main/resources/gui/gui_variables.json | |
| parent | e59c64b7d84a4a4c474e9dc24a945b92403b5bee (diff) | |
| parent | cb90c0622c301d16cefa83a19385576dbbca1365 (diff) | |
Solved conflict between files
Diffstat (limited to 'container-search-gui/src/main/resources/gui/gui_variables.json')
| -rw-r--r-- | container-search-gui/src/main/resources/gui/gui_variables.json | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/container-search-gui/src/main/resources/gui/gui_variables.json b/container-search-gui/src/main/resources/gui/gui_variables.json deleted file mode 100644 index 1b5f411611a..00000000000 --- a/container-search-gui/src/main/resources/gui/gui_variables.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "propertyname" : ["propertyname"], - "featurename" : ["featurename"] -} |