[Fencommits] fenfire-hs: resolve conflict

[Benja Fallenstein]

Tue Feb 20 17:38:43 EET 2007  Benja Fallenstein <benja.fallenstein at gmail.com>
  * resolve conflict
diff -rN -u old-fenfire-hs/Fenfire.fhs new-fenfire-hs/Fenfire.fhs
--- old-fenfire-hs/Fenfire.fhs	2007-02-20 17:38:58.000000000 +0200
+++ new-fenfire-hs/Fenfire.fhs	2007-02-20 17:38:58.000000000 +0200
@@ -650,6 +650,10 @@
                stockStrikethrough , Just "<Alt>BackSpace" )
             , ("loadURI", Just "_Load node's URI"           ,
                stockGoForward     , Just "<Ctl>L"         )
+            , ("addprop", Just "Make _focused node a property" ,
+               stockAdd           , Just "<Shift>P"       )
+            , ("changeURI", Just "Change node's _URI"       ,
+               stockRefresh       , Just "u"              )
             ]
     forM bindingentries $ \(name,label',stock,accel) -> do 
         action <- actionNew name label' Nothing (Just stock)