Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
HDL
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RTSD
HDL
Commits
2a6de257
Commit
2a6de257
authored
2 years ago
by
Pieter Donker
Browse files
Options
Downloads
Plain Diff
CWG-44
, fixed merge failure
parents
23ac6395
ec5bfcde
No related branches found
No related tags found
Loading
Checking pipeline status
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+8
-9
8 additions, 9 deletions
.gitlab-ci.yml
applications/lofar2/doc/prestudy/station2_sdp_transient_buffer.txt
+228
-103
228 additions, 103 deletions
...ons/lofar2/doc/prestudy/station2_sdp_transient_buffer.txt
with
236 additions
and
112 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
