[acassen/keepalived] 023e9b: Remove a merge conflict .rej file accidentally add...
pqarmitage <[email protected]> Wed, 11 Oct 2017 01:34:36 -0700
| Newsgroups | gmane.linux.keepalived.devel |
|---|---|
| Message-ID | <59ddd79ce9651_2e243f93a975bc38638ab@hookshot-fe-92cdb05.cp1-iad.github.net.mail> |
Branch: refs/heads/master
Home: https://github.com/acassen/keepalived
Commit: 023e9b14c9500cad73df0250f2b0cb4d28ed25ea
https://github.com/acassen/keepalived/commit/023e9b14c9500cad73df0250f2b0cb4d28ed25ea
Author: Quentin Armitage <[email protected]>
Date: 2017-10-11 (Wed, 11 Oct 2017)
Changed paths:
M .gitignore
R lib/parser.c.rej
Log Message:
-----------
Remove a merge conflict .rej file accidentally added to git
This commit also updates the .gitconfig file to ensure that .rej
files will not be added in the future.
Commit: 68c81ea8850a3ec8df93fa117d116fdd224a8806
https://github.com/acassen/keepalived/commit/68c81ea8850a3ec8df93fa117d116fdd224a8806
Author: pqarmitage <[email protected]>
Date: 2017-10-11 (Wed, 11 Oct 2017)
Changed paths:
M .gitignore
R lib/parser.c.rej
Log Message:
-----------
Merge pull request #669 from pqarmitage/fixes
Remove a merge conflict .rej file accidentally added to git and don't add them in future
Compare: https://github.com/acassen/keepalived/compare/beb3889a9e8d...68c81ea8850a
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Keepalived-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/keepalived-devel