Fix duplicate default template in listings

This hotfix addresses an error where the default template would appear
at least twice when using a different organization to the users
organization affiliated organization.

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
-## [2.1.3+portage-1.0.10] - 2021-06-03
+
+## [2.1.3+portage-1.0.14] - 2021-06-17
+
+## Fixed
+ - Remove duplicate listing of default template when chosen organization has a customized default template
+
+## [2.1.3+portage-1.0.13] - 2021-06-16
 
 ## Fixed
  - Removed references to organizations customized template and to default template

app/controllers/template_options_controller.rb

@@ -60,8 +60,8 @@ def index
 
       customization = Template.default unless customization
 
-      @templates.select! { |t| t.id != Template.default.id || t.id != customization.id}
-
+      @templates.select! { |t| t.id != Template.default.id && t.id != customization.id}
+      
       # We want the default template to appear at the beggining of the list
       @templates.unshift(customization)
     end