Skip to content

Commit b5ed073

Browse files
fossjunkieMariusz Kliber
authored and
Mariusz Kliber
committed
Add a test file
1 parent 2d46272 commit b5ed073

File tree

3 files changed

+23
-0
lines changed

3 files changed

+23
-0
lines changed

cpp/ql/lib/CHANGELOG.md

+21
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD
12
## 0.5.0
23

34
### Breaking Changes
@@ -19,10 +20,16 @@ The predicates in the `MustFlow::Configuration` class used by the `MustFlow` lib
1920
* The `scanf` and `fscanf` functions and their variants are now recognized as flow sources.
2021
* Deleted the deprecated `getName` and `getShortName` predicates from the `Folder` class.
2122

23+
=======
24+
<<<<<<< HEAD
25+
>>>>>>> 5e6a94d7bd (Add a test file)
2226
## 0.4.6
2327

2428
No user-facing changes.
2529

30+
=======
31+
<<<<<<< HEAD
32+
>>>>>>> e46143b9a7 (Add a test file)
2633
## 0.4.5
2734

2835
No user-facing changes.
@@ -37,6 +44,9 @@ No user-facing changes.
3744

3845
* Fixed bugs in the `FormatLiteral` class that were causing `getMaxConvertedLength` and related predicates to return no results when the format literal was `%e`, `%f` or `%g` and an explicit precision was specified.
3946

47+
=======
48+
<<<<<<< HEAD
49+
>>>>>>> 74a0494317 (Add a test file)
4050
## 0.4.2
4151

4252
No user-facing changes.
@@ -45,6 +55,9 @@ No user-facing changes.
4555

4656
No user-facing changes.
4757

58+
=======
59+
<<<<<<< HEAD
60+
>>>>>>> da519a0b5a (Add a test file)
4861
## 0.4.0
4962

5063
### Deprecated APIs
@@ -62,6 +75,9 @@ No user-facing changes.
6275

6376
## 0.3.5
6477

78+
=======
79+
<<<<<<< HEAD
80+
>>>>>>> b6a8c5bd08 (Add a test file)
6581
## 0.3.4
6682

6783
### Deprecated APIs
@@ -78,6 +94,9 @@ No user-facing changes.
7894

7995
* All deprecated predicates/classes/modules that have been deprecated for over a year have been deleted.
8096

97+
=======
98+
<<<<<<< HEAD
99+
>>>>>>> cdd3244a90 (Add a test file)
81100
## 0.3.3
82101

83102
### New Features
@@ -96,6 +115,8 @@ No user-facing changes.
96115

97116
* Under certain circumstances a variable declaration that is not also a definition could be associated with a `Variable` that did not have the definition as a `VariableDeclarationEntry`. This is now fixed, and a unique `Variable` will exist that has both the declaration and the definition as a `VariableDeclarationEntry`.
98117

118+
=======
119+
>>>>>>> 59c7b6be50 (Add a test file)
99120
## 0.3.1
100121

101122
### Minor Analysis Improvements

cpp/ql/qlucie.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Test PR

python/ql/lib/testfile.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Qlucie

0 commit comments

Comments
 (0)