From d026bcff1479fd14ae8095002cd64ee768bffe84 Mon Sep 17 00:00:00 2001 From: Philip Leifeld Date: Thu, 29 Aug 2024 18:49:37 +0200 Subject: [PATCH] Fixed README --- README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/README.md b/README.md index 7504d623..73eba276 100755 --- a/README.md +++ b/README.md @@ -12,13 +12,6 @@ The Java software Discourse Network Analyzer (DNA) is a qualitative content anal - The software comes with an R package called rDNA for remote controlling DNA and for further ways of analyzing the networks. -<<<<<<< HEAD -======= -[![DNA/rDNA build](https://github.com/leifeld/dna/actions/workflows/DNA%20build.yml/badge.svg)](https://github.com/leifeld/dna/actions/workflows/DNA%20build.yml) - -## DNA 3.0: current development status - ->>>>>>> c50a431 (Updated README) [DNA 3.0](https://github.com/leifeld/dna/releases) was first released on 12 June 2022. It constitutes a major rewrite from the previous version DNA 2.0 beta 25. DNA 3 comes with many new features and improvements. The [release](https://github.com/leifeld/dna/releases) page contains all the details (scroll to version 3.0.7 for the first DNA 3 release). [![build-check-test](https://github.com/leifeld/dna/actions/workflows/build-check-test.yml/badge.svg)](https://github.com/leifeld/dna/actions/workflows/build-check-test.yml)