Added jsbml to .gitignore

This commit is contained in:
Tramy Nguyen 2017-02-20 17:05:10 -07:00
parent 7e49d0d7e8
commit a092bd3d45
2 changed files with 1 additions and 35 deletions

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
/dist/
/target/
/jsbml.log

View file

@ -1,35 +0,0 @@
<<<<<<< HEAD
=======
2017-02-01 22:08:50,836 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,840 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,841 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,841 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,842 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,842 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,843 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,843 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,844 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,845 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,846 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,847 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,847 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,848 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,848 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,849 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:08:50,850 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:10:50,331 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:10:50,334 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:10:50,335 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:10:50,335 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:10:50,336 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:10:50,337 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-01 22:10:50,338 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-07 15:56:05,150 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-07 15:56:11,240 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-07 15:56:11,241 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-07 15:56:11,241 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-07 15:56:11,242 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-07 15:56:11,242 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-07 15:56:11,243 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
2017-02-07 15:56:11,243 WARN o.j.SEDMLReader [AWT-EventQueue-0] Unexpected [Element: <annotation [Namespace: http://sed-ml.org/sed-ml/level1/version2]/>]
>>>>>>> branch 'master' of https://github.com/MyersResearchGroup/iBioSim.git