projects
/
trust_router.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Remove forgotten merge cruft.
[trust_router.git]
/
common
/
tr_rp.c
diff --git
a/common/tr_rp.c
b/common/tr_rp.c
index
4d87dbc
..
afa87fa
100644
(file)
--- a/
common/tr_rp.c
+++ b/
common/tr_rp.c
@@
-125,11
+125,7
@@
TR_RP_REALM *tr_rp_realm_lookup(TR_RP_REALM *rp_realms, TR_NAME *rp_name)
{
TR_RP_REALM *rp = NULL;
-<<<<<<< HEAD
if (!rp_name) {
-=======
- if ((!rp_realms) || (!rp_name)) {
->>>>>>> 09d2f44c757b9ffc2f38a28bdf212c61f67dabd8
tr_debug("tr_rp_realm_lookup: Bad parameters.");
return NULL;
}