Squashed 'src/main/resources/csl-styles/' changes from 143464e..906cd6d

906cd6d Create technische-universitat-dresden-linguistik-author-date (JabRef#4730)
607a056 Create ifao-publications.csl (JabRef#4731)
5a65f50 remove et-al settings for bibliography for PVS (JabRef#4735)
4a145d4 Create current-opinion-in-endocrinology-diabetes-and-obesity.csl (JabRef#4734)
d70c2a4 Add chapter section in bibliography (JabRef#4732)
366dbc1 Create economic-history-review.csl (JabRef#4643)
7069ddc Create the-open-university-harvard-s390-modules.csl (JabRef#4711)
a789973 Chicago: Uppercase "Presentated at" if no `genre` (JabRef#4729)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 906cd6d

technische-universitat-dresden-linguistik.csl

@@ -119,7 +119,11 @@
       </group>
     </layout>
   </citation>
+<<<<<<< HEAD
   <bibliography et-al-min="9" et-al-use-first="1" entry-spacing="0" hanging-indent="true">
+=======
+  <bibliography et-al-min="9" et-al-use-first="1">
+>>>>>>> Squashed 'src/main/resources/csl-styles/' changes from 143464eff6..906cd6d43d
     <sort>
       <key macro="creator-short"/>
       <key macro="creator-year-short"/>