diff options
| author | t-ask | 2020-02-19 14:58:30 +0100 |
|---|---|---|
| committer | t-ask | 2020-02-19 14:58:30 +0100 |
| commit | 836e5efa63aece33ca6a3280d1e2e87521621b42 (patch) | |
| tree | b20a9985c7497cf422a65a4424ed37b5ee2d249d /substance-designer.desktop | |
| parent | dd1faa6a02b03505f07590e5f9f96d54394cbded (diff) | |
| parent | 0fc27b16760674840c8092911263cf2cc924d9ec (diff) | |
| download | aur-836e5efa63aece33ca6a3280d1e2e87521621b42.tar.gz | |
Fix merge conflict
Diffstat (limited to 'substance-designer.desktop')
| -rw-r--r-- | substance-designer.desktop | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/substance-designer.desktop b/substance-designer.desktop index fdae7ba8c8e5..2da1f370e71a 100644 --- a/substance-designer.desktop +++ b/substance-designer.desktop @@ -4,7 +4,10 @@ GenericName=Material Authoring Software Description=PBR material design and authoring tool Exec=/usr/bin/substance-designer Icon=substance-designer-icon +<<<<<<< HEAD Version=2019.3.3 +======= +>>>>>>> 0fc27b16760674840c8092911263cf2cc924d9ec Terminal=false Type=Application StartupNotify=true |