anchor.diff:  
   handle_call({config_node, Who, Passwd, Node, _Option, _Optarg}, _From, Session) ->
       case login(Session, Who, Passwd) of
  -<<<<<<< HEAD
  -        {ok, _J} ->
  -            {ok, _S} = application:get_env(pubsub_service),
  -            case request_node_config(_J, _S, _Node, Session) of
  -                {ok, N} -> 
  -                    #xmlel{children=C} = N,
  -                    Xold = find_element(C, "jabber:x:data", "x"),
  -                    {reply, {ok, N, Xold}, restart_session(Session)};
  -                E -> {reply, E, restart_session(Session)}
  -            end;
  -        E -> {reply, E, restart_session(Session)}
  -=======
  -        {ok, J} ->
  +       {ok, J} ->
   			case request_node_config(J, Node, Session) of 
  -				{ok, P, R} -> 
  -					T = exmpp_xml:set_attribute(R, exmpp_xml:attribute(<<"type">>, "set")),										
  -					X = exmpp_xml:get_element(T, "xmlns=jabber:x:data", "x"),
  -					{reply, {ok, ?DBG_RET(Session, {config_node, Session, P, R, T, X})}, 
  -						restart_session(Session)};
  -				{E, P} -> {reply, ?DBG_RET(E, {E, {config_node, E, P}}), 
  -					restart_session(Session)}
  +				{ok, N} -> {reply, {ok, N}, restart_session(Session)};
  +				E -> {reply, E, restart_session(Session)}
   			end;
          E -> {reply, E, restart_session(Session)}
  ->>>>>>> ef95e7dc605dd5625a9b551ff4e48169d906c5dd
       end;
   
   handle_call({info, Code}, _From, Session) ->
       {reply, info(Code, ?RESOURCE), Session};
   
  -handle_call({set_cdata, Node, Name, Attr, Cdata}, _From, Session) ->
  -    {reply, set_cdata2(Node, Name, Attr, Cdata)};
  -
   handle_call(_Request, _From, State) ->
       {reply, ok, State}.
   
  
positive.code: -export([start_link/0]).
  -export([disco_info/2, disco_info/3, disco_items/2, disco_items/3]).
  -export([create_node/3, delete_node/3, node_config/3, config_node/5]).
  -export([info/1, set_cdata/4]).
  
  
  %% ------------------------------------------------------------------
  
negative.code:             find_element(N, NS, Name)
      end.
  
  find_element_by_attr([], _Name, _Attr, _Val) ->
      undefined;
  
  find_element_by_attr([Node|Tail], Name, Attr, Val) ->
      case exmpp_xml:get_name_as_atom(Node) of
          Name -> case exmpp_xml:get_attribute(Node, Attr, undefined) of 
                      Val -> Node;
                      _ -> find_element_by_attr(Tail, Name, Attr, Val)
                  end;
          _ -> find_element_by_attr(Tail, Name, Attr, Val)
      end.
  
  