Resolved (non-)conflict.
Resolved (non-)conflict.


Mr-DLib/jabref,tobiasdiez/jabref,sauliusg/jabref,sauliusg/jabref,shitikanth/jabref,Mr-DLib/jabref,JabRef/jabref,tschechlovdev/jabref,oscargus/jabref,tschechlovdev/jabref,oscargus/jabref,tschechlovdev/jabref,jhshinn/jabref,mairdl/jabref,shitikanth/jabref,shitikanth/jabref,grimes2/jabref,tobiasdiez/jabref,tobiasdiez/jabref,bartsch-dev/jabref,bartsch-dev/jabref,tschechlovdev/jabref,grimes2/jabref,jhshinn/jabref,zellerdev/jabref,jhshinn/jabref,mairdl/jabref,tobiasdiez/jabref,obraliar/jabref,ayanai1/jabref,mredaelli/jabref,mredaelli/jabref,motokito/jabref,Mr-DLib/jabref,bartsch-dev/jabref,motokito/jabref,ayanai1/jabref,oscargus/jabref,jhshinn/jabref,grimes2/jabref,Siedlerchr/jabref,obraliar/jabref,Braunch/jabref,ayanai1/jabref,jhshinn/jabref,JabRef/jabref,JabRef/jabref,obraliar/jabref,sauliusg/jabref,motokito/jabref,oscargus/jabref,Braunch/jabref,Siedlerchr/jabref,motokito/jabref,Braunch/jabref,mairdl/jabref,ayanai1/jabref,mredaelli/jabref,Braunch/jabref,bartsch-dev/jabref,Siedlerchr/jabref,ayanai1/jabref,zellerdev/jabref,shitikanth/jabref,sauliusg/jabref,obraliar/jabref,JabRef/jabref,tschechlovdev/jabref,grimes2/jabref,mredaelli/jabref,mairdl/jabref,grimes2/jabref,zellerdev/jabref,Mr-DLib/jabref,shitikanth/jabref,Siedlerchr/jabref,motokito/jabref,Braunch/jabref,oscargus/jabref,zellerdev/jabref,obraliar/jabref,bartsch-dev/jabref,zellerdev/jabref,mredaelli/jabref,mairdl/jabref,Mr-DLib/jabref