Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/NEWS
diff options
context:
space:
mode:
Diffstat (limited to 'NEWS')
-rw-r--r--NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index e2f4d8f..7de79ec 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+<<<<<<< HEAD:NEWS
+=======
83
* added new user-interface features
@@ -35,6 +37,7 @@
* minor updates to Spanish translations
+>>>>>>> f1d5ed75c29961a718eb3c59fde1663c184f20cf:NEWS
81
* fixed keyboard input bug introduced in v79