Module: nagvis
Branch: master
Commit: 3b849c3ad5d9f1efaa5c129cfe22fdc9296e6691
URL:    
http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=3b849c3ad5d9f1efaa5c129cfe22fdc9296e6691

Author: Lars Michelsen <[email protected]>
Date:   Sun Dec  5 18:10:09 2010 +0100

Removed merge rests

---

 ChangeLog |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f751611..b6299ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,6 @@
 1.1.6a1
 
 Core
-<<<<<<< HEAD:ChangeLog
     * Added user/role profile config files located in 
nagvis/etc/profiles/(user|role).profile
       The profile files can contain user/role specific options like languages 
and so on
     * The language of a user is stored in the profile file now


------------------------------------------------------------------------------
What happens now with your Lotus Notes apps - do you make another costly 
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus 
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins

Reply via email to