Skip to content

Commit f893e22

Browse files
committed
Added a better error-message for using subscripts in modifiers
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk/doc@19132 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent 2ce27fd commit f893e22

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

bibliography/openmodelica.bib

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,9 +2066,6 @@ @PROCEEDINGS{scsc1998
20662066
year = {1998}
20672067
}
20682068

2069-
<<<<<<< .mine
2070-
2071-
=======
20722069
@PROCEEDINGS{cpc2013,
20732070
key = {CPC'2013},
20742071
editor = {Alain Darte},
@@ -2078,5 +2075,3 @@ @PROCEEDINGS{cpc2013
20782075
month = jul,
20792076
location = {Lyon, France},
20802077
}
2081-
2082-
>>>>>>> .r19130

0 commit comments

Comments
 (0)