Skip to content

Commit 974d576

Browse files
fossjunkieMariusz Kliber
authored and
Mariusz Kliber
committed
Add a test file
1 parent 8b8e74c commit 974d576

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

cpp/ql/lib/CHANGELOG.md

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

34
### Deprecated APIs
@@ -14,6 +15,9 @@
1415

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

18+
=======
19+
<<<<<<< HEAD
20+
>>>>>>> cdd3244a90 (Add a test file)
1721
## 0.3.3
1822

1923
### New Features
@@ -32,6 +36,8 @@
3236

3337
* 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`.
3438

39+
=======
40+
>>>>>>> 59c7b6be50 (Add a test file)
3541
## 0.3.1
3642

3743
### Minor Analysis Improvements

cpp/ql/qlucie.txt

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

0 commit comments

Comments
 (0)