Menu
▾
▴
dbunit Merge Request #13: Fix of issue#389. And adding oracle driver installation scripts (rejected)
Merging...
Merged
Something went wrong. Please, merge manually
Checking if merge is possible...
Something went wrong. Please, merge manually
Anton wants to merge 2 commits from /u/apechinsky/dbunit/ to master, 2016-06-06
| Commit | Date | |
|---|---|---|
|
[e2ab29]
by
Anton Pechinsky
Add shell scripts for installing oracle jdbc drivers. Add scripts for ojdbc7 |
2016-06-05 16:18:59 | Tree |
|
[90c2b4]
by
Anton Pechinsky
#389 Any characters with code greater than 7f are written to XML attribute value as entity |
2016-06-05 16:18:20 | Tree |
Thanks!
Please rebase from master so the merge is clean.
done
Still shows conflicts to me. Perhaps you need to update the merge request?