fix conflicts between Cols and updated #725

lunny · 2017-09-15T01:41:47Z

lunny commented

2017-09-15 01:41:47 +00:00

As title.

codecov-io commented

2017-09-15 01:51:25 +00:00

(Migrated from github.com)

Codecov Report

Merging #725 into master will decrease coverage by <.01%.
The diff coverage is 100%.

@@            Coverage Diff            @@
##           master    #725      +/-   ##
=========================================
- Coverage   52.41%   52.4%   -0.01%     
=========================================
  Files          35      35              
  Lines        8225    8226       +1     
=========================================
  Hits         4311    4311              
  Misses       3431    3431              
- Partials      483     484       +1

Impacted Files	Coverage Δ
session_update.go	`51.29% <100%> (+0.15%)`	⬆️
xorm.go	`66.19% <0%> (-1.41%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c29485f...c746e72. Read the comment docs.

# [Codecov](https://codecov.io/gh/go-xorm/xorm/pull/725?src=pr&el=h1) Report > Merging [#725](https://codecov.io/gh/go-xorm/xorm/pull/725?src=pr&el=desc) into [master](https://codecov.io/gh/go-xorm/xorm/commit/c29485f954ed6495861c0098f9a1642a467299c8?src=pr&el=desc) will **decrease** coverage by `<.01%`. > The diff coverage is `100%`. [![Impacted file tree graph](https://codecov.io/gh/go-xorm/xorm/pull/725/graphs/tree.svg?src=pr&token=yB5nO1krEe&height=150&width=650)](https://codecov.io/gh/go-xorm/xorm/pull/725?src=pr&el=tree) ```diff @@ Coverage Diff @@ ## master #725 +/- ## ========================================= - Coverage 52.41% 52.4% -0.01% ========================================= Files 35 35 Lines 8225 8226 +1 ========================================= Hits 4311 4311 Misses 3431 3431 - Partials 483 484 +1 ``` | [Impacted Files](https://codecov.io/gh/go-xorm/xorm/pull/725?src=pr&el=tree) | Coverage Δ | | |---|---|---| | [session\_update.go](https://codecov.io/gh/go-xorm/xorm/pull/725?src=pr&el=tree#diff-c2Vzc2lvbl91cGRhdGUuZ28=) | `51.29% <100%> (+0.15%)` | :arrow_up: | | [xorm.go](https://codecov.io/gh/go-xorm/xorm/pull/725?src=pr&el=tree#diff-eG9ybS5nbw==) | `66.19% <0%> (-1.41%)` | :arrow_down: | ------ [Continue to review full report at Codecov](https://codecov.io/gh/go-xorm/xorm/pull/725?src=pr&el=continue). > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta) > `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data` > Powered by [Codecov](https://codecov.io/gh/go-xorm/xorm/pull/725?src=pr&el=footer). Last update [c29485f...c746e72](https://codecov.io/gh/go-xorm/xorm/pull/725?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).

lunny referenced this issue from a commit

2019-10-21 05:47:00 +00:00

fix conflicts between Cols and updated (#725)

Sign in to join this conversation.

No reviewers

No Milestone

No Assignees

1 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: xorm/xorm#725