From d68d044c91516df5b32665ed8941336e7f27974d Mon Sep 17 00:00:00 2001
From: github actions <jabrefmail+webfeedback@gmail.com>
Date: Fri, 1 May 2020 02:07:04 +0000
Subject: [PATCH] Squashed 'src/main/resources/csl-styles/' changes from
 143464eff6..906cd6d43d

906cd6d43d Create technische-universitat-dresden-linguistik-author-date (#4730)
607a05673e Create ifao-publications.csl (#4731)
5a65f504da remove et-al settings for bibliography for PVS (#4735)
4a145d43ec Create current-opinion-in-endocrinology-diabetes-and-obesity.csl (#4734)
d70c2a4015 Add chapter section in bibliography (#4732)
366dbc13c6 Create economic-history-review.csl (#4643)
7069ddc837 Create the-open-university-harvard-s390-modules.csl (#4711)
a789973291 Chicago: Uppercase "Presentated at" if no `genre` (#4729)

git-subtree-dir: src/main/resources/csl-styles
git-subtree-split: 906cd6d43d0c136190ecfbb12f6af0ca794e3c5b
---
 technische-universitat-dresden-linguistik.csl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/technische-universitat-dresden-linguistik.csl b/technische-universitat-dresden-linguistik.csl
index 0ed5e4aa56fe..3dceb19e974b 100644
--- a/technische-universitat-dresden-linguistik.csl
+++ b/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"/>